1
0
mirror of https://codeberg.org/tenplus1/farming.git synced 2024-11-10 20:30:31 +01:00

tidy code, fix straw recipe

This commit is contained in:
tenplus1 2024-08-12 08:29:34 +01:00
parent 09b06ea72a
commit 95bd342cda
3 changed files with 270 additions and 324 deletions

View File

@ -10,20 +10,6 @@ minetest.register_craftitem("farming:flour", {
groups = {food_flour = 1, flammable = 1}
})
-- Bread
if not farming.mcl then
minetest.register_craftitem("farming:bread", {
description = S("Bread"),
inventory_image = "farming_bread.png",
on_use = minetest.item_eat(5),
groups = {food_bread = 1}
})
farming.add_eatable("farming:bread", 5)
end
-- Garlic bulb
minetest.register_craftitem("farming:garlic", {
@ -53,7 +39,7 @@ minetest.register_node("farming:garlic_braid", {
"crops_garlic_braid.png",
"crops_garlic_braid.png"
},
groups = {vessel = 1, dig_immediate = 3, flammable = 3, compostability = 65},
groups = {vessel = 1, dig_immediate = 3, flammable = 3, compostability = 65, handy = 1},
is_ground_content = false,
sounds = farming.node_sound_leaves_defaults(),
node_box = {
@ -105,7 +91,7 @@ minetest.register_node("farming:coffee_cup", {
type = "fixed",
fixed = {-0.25, -0.5, -0.25, 0.25, 0.25, 0.25}
},
groups = {vessel = 1, dig_immediate = 3, attached_node = 1, drink = 1},
groups = {vessel = 1, dig_immediate = 3, attached_node = 1, drink = 1, handy = 1},
is_ground_content = false,
on_use = minetest.item_eat(2, "vessels:drinking_glass"),
sounds = farming.node_sound_glass_defaults()
@ -116,31 +102,8 @@ farming.add_eatable("farming:coffee_cup", 2)
minetest.register_alias("farming:coffee_cup_hot", "farming:coffee_cup")
minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass")
-- Cocoa beans
if not farming.mcl then
minetest.register_craftitem("farming:cocoa_beans", {
description = S("Cocoa Beans"),
inventory_image = "farming_cocoa_beans.png",
groups = {compostability = 65, food_cocoa = 1, flammable = 2}
})
end
-- Chocolate cookie
if not farming.mcl then
minetest.register_craftitem("farming:cookie", {
description = S("Cookie"),
inventory_image = "farming_cookie.png",
on_use = minetest.item_eat(2)
})
farming.add_eatable("farming:cookie", 2)
end
-- Bar of of dark chocolate (thx to Ice Pandora for her deviantart.com chocolate tutorial)
minetest.register_craftitem("farming:chocolate_dark", {
description = S("Bar of Dark Chocolate"),
inventory_image = "farming_chocolate_dark.png",
@ -150,11 +113,12 @@ minetest.register_craftitem("farming:chocolate_dark", {
farming.add_eatable("farming:chocolate_dark", 3)
-- Chocolate block (not edible)
minetest.register_node("farming:chocolate_block", {
description = S("Chocolate Block"),
tiles = {"farming_chocolate_block.png"},
is_ground_content = false,
groups = {cracky = 2, oddly_breakable_by_hand = 2},
groups = {cracky = 2, oddly_breakable_by_hand = 2, handy = 1},
sounds = farming.node_sound_stone_defaults()
})
@ -189,19 +153,6 @@ minetest.register_craftitem("farming:carrot_juice", {
farming.add_eatable("farming:carrot_juice", 4)
-- Golden carrot
if not farming.mcl then
minetest.register_craftitem("farming:carrot_gold", {
description = S("Golden Carrot"),
inventory_image = "farming_carrot_gold.png",
on_use = minetest.item_eat(10)
})
farming.add_eatable("farming:carrot_gold", 10)
end
-- Blueberry Pie
minetest.register_craftitem("farming:blueberry_pie", {
@ -224,19 +175,6 @@ minetest.register_craftitem("farming:muffin_blueberry", {
farming.add_eatable("farming:muffin_blueberry", 2)
-- beetroot soup
if not farming.mcl then
minetest.register_craftitem("farming:beetroot_soup", {
description = S("Beetroot Soup"),
inventory_image = "farming_beetroot_soup.png",
on_use = minetest.item_eat(6, "farming:bowl")
})
farming.add_eatable("farming:beetroot_soup", 6)
end
-- Tomato soup
minetest.register_craftitem("farming:tomato_soup", {
@ -289,17 +227,6 @@ minetest.register_craftitem("farming:glass_water", {
groups = {food_glass_water = 1, flammable = 3, vessel = 1}
})
-- Sugar
if not farming.mcl then
minetest.register_craftitem("farming:sugar", {
description = S("Sugar"),
inventory_image = "farming_sugar.png",
groups = {food_sugar = 1, flammable = 3}
})
end
-- Sugar cube
minetest.register_node("farming:sugar_cube", {
@ -331,7 +258,7 @@ minetest.register_node("farming:salt", {
visual_scale = 0.8,
paramtype = "light",
tiles = {"farming_salt.png"},
groups = {food_salt = 1, vessel = 1, dig_immediate = 3, attached_node = 1},
groups = {food_salt = 1, vessel = 1, dig_immediate = 3, attached_node = 1, handy = 1},
is_ground_content = false,
sounds = farming.node_sound_defaults(),
selection_box = {
@ -390,12 +317,11 @@ minetest.register_node("farming:salt_crystal", {
paramtype = "light",
light_source = 1,
tiles = {"farming_salt_crystal.png"},
groups = {dig_immediate = 3, attached_node = 1},
groups = {dig_immediate = 3, attached_node = 1, handy = 1},
is_ground_content = false,
sounds = farming.node_sound_defaults(),
selection_box = {
type = "fixed",
fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
},
_mcl_hardness = 0.8,
_mcl_blast_resistance = 1
@ -419,7 +345,7 @@ minetest.register_node("farming:mayonnaise", {
},
groups = {
compostability = 65, food_mayonnaise = 1, vessel = 1, dig_immediate = 3,
attached_node = 1
attached_node = 1, handy = 1
},
sounds = farming.node_sound_glass_defaults()
})
@ -437,13 +363,12 @@ minetest.register_node("farming:rose_water", {
paramtype = "light",
tiles = {"farming_rose_water.png"},
groups = {
food_rose_water = 1, vessel = 1, dig_immediate = 3, attached_node = 1
food_rose_water = 1, vessel = 1, dig_immediate = 3, attached_node = 1, handy = 1
},
is_ground_content = false,
sounds = farming.node_sound_defaults(),
selection_box = {
type = "fixed",
fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
}
})
@ -766,14 +691,13 @@ minetest.register_node("farming:pepper_ground", {
paramtype = "light",
tiles = {"crops_pepper_ground.png"},
groups = {
vessel = 1, food_pepper_ground = 1,
vessel = 1, food_pepper_ground = 1, handy = 1,
dig_immediate = 3, attached_node = 1, compostability = 30
},
is_ground_content = false,
sounds = farming.node_sound_defaults(),
selection_box = {
type = "fixed",
fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
}
})
@ -799,19 +723,6 @@ minetest.register_craftitem("farming:pineapple_juice", {
farming.add_eatable("farming:pineapple_juice", 4)
-- Baked potato
if not farming.mcl then
minetest.register_craftitem("farming:baked_potato", {
description = S("Baked Potato"),
inventory_image = "farming_baked_potato.png",
on_use = minetest.item_eat(6)
})
farming.add_eatable("farming:baked_potato", 6)
end
-- Potato & cucumber Salad
minetest.register_craftitem("farming:potato_salad", {
@ -912,12 +823,11 @@ minetest.register_node("farming:soy_sauce", {
paramtype = "light",
walkable = false,
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
},
groups = {
vessel = 1, food_soy_sauce = 1, dig_immediate = 3, attached_node = 1,
compostability = 65
compostability = 65, handy = 1
},
is_ground_content = false,
sounds = farming.node_sound_glass_defaults()
@ -934,12 +844,11 @@ minetest.register_node("farming:soy_milk", {
paramtype = "light",
walkable = false,
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
},
on_use = minetest.item_eat(2, "vessels:drinking_glass"),
groups = {
vessel = 1, food_milk_glass = 1, dig_immediate = 3,
vessel = 1, food_milk_glass = 1, dig_immediate = 3, handy = 1,
attached_node = 1, drink = 1, compostability = 65
},
is_ground_content = false,
@ -999,7 +908,7 @@ minetest.register_node("farming:sunflower_oil", {
},
groups = {
food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1,
flammable = 2, compostability = 65
flammable = 2, compostability = 65, handy = 1
},
sounds = farming.node_sound_glass_defaults()
})
@ -1029,6 +938,78 @@ minetest.register_node("farming:vanilla_extract", {
selection_box = {
type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
},
groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
groups = {vessel = 1, dig_immediate = 3, attached_node = 1, handy = 1},
sounds = farming.node_sound_glass_defaults(),
})
--= Foods we shouldn't add when using Mineclonia/VoxeLibre
if not farming.mcl then
-- Bread
minetest.register_craftitem("farming:bread", {
description = S("Bread"),
inventory_image = "farming_bread.png",
on_use = minetest.item_eat(5),
groups = {food_bread = 1}
})
farming.add_eatable("farming:bread", 5)
-- Cocoa beans
minetest.register_craftitem("farming:cocoa_beans", {
description = S("Cocoa Beans"),
inventory_image = "farming_cocoa_beans.png",
groups = {compostability = 65, food_cocoa = 1, flammable = 2}
})
-- Chocolate cookie
minetest.register_craftitem("farming:cookie", {
description = S("Cookie"),
inventory_image = "farming_cookie.png",
on_use = minetest.item_eat(2)
})
farming.add_eatable("farming:cookie", 2)
-- Golden carrot
minetest.register_craftitem("farming:carrot_gold", {
description = S("Golden Carrot"),
inventory_image = "farming_carrot_gold.png",
on_use = minetest.item_eat(10)
})
farming.add_eatable("farming:carrot_gold", 10)
-- Beetroot soup
minetest.register_craftitem("farming:beetroot_soup", {
description = S("Beetroot Soup"),
inventory_image = "farming_beetroot_soup.png",
on_use = minetest.item_eat(6, "farming:bowl")
})
farming.add_eatable("farming:beetroot_soup", 6)
-- Sugar
minetest.register_craftitem("farming:sugar", {
description = S("Sugar"),
inventory_image = "farming_sugar.png",
groups = {food_sugar = 1, flammable = 3}
})
-- Baked potato
minetest.register_craftitem("farming:baked_potato", {
description = S("Baked Potato"),
inventory_image = "farming_baked_potato.png",
on_use = minetest.item_eat(6)
})
farming.add_eatable("farming:baked_potato", 6)
end

View File

@ -1,17 +1,6 @@
local S = minetest.get_translator("farming")
-- wooden bowl
if not farming.mcl then
minetest.register_craftitem("farming:bowl", {
description = S("Wooden Bowl"),
inventory_image = "farming_bowl.png",
groups = {food_bowl = 1, flammable = 2}
})
end
-- saucepan
minetest.register_craftitem("farming:saucepan", {
@ -95,17 +84,6 @@ minetest.register_node("farming:bottle_ethanol", {
sounds = farming.node_sound_glass_defaults()
})
-- String
if not farming.mcl then
minetest.register_craftitem("farming:string", {
description = S("String"),
inventory_image = "farming_string.png",
groups = {flammable = 2}
})
end
-- straw
minetest.register_node("farming:straw", {
@ -190,10 +168,50 @@ minetest.register_node("farming:hemp_rope", {
_mcl_blast_resistance = 1
})
-- Jack 'O Lantern
--- Wooden scarecrow base
minetest.register_node("farming:scarecrow_bottom", {
description = S("Scarecrow Bottom"),
paramtype = "light",
sunlight_propagates = true,
paramtype2 = "facedir",
tiles = {"default_wood.png"},
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {
{-1/16, -8/16, -1/16, 1/16, 8/16, 1/16},
{-12/16, 4/16, -1/16, 12/16, 2/16, 1/16},
}
},
groups = {axey = 1, handy = 1, snappy = 3, flammable = 2},
is_ground_content = false,
_mcl_hardness = 0.8,
_mcl_blast_resistance = 1
})
--= Items we shouldn't add when using Mineclonia/VoxeLibre
if not farming.mcl then
-- Wooden bowl
minetest.register_craftitem("farming:bowl", {
description = S("Wooden Bowl"),
inventory_image = "farming_bowl.png",
groups = {food_bowl = 1, flammable = 2}
})
-- String
minetest.register_craftitem("farming:string", {
description = S("String"),
inventory_image = "farming_string.png",
groups = {flammable = 2}
})
-- Jack 'O Lantern
minetest.register_node("farming:jackolantern", {
description = S("Jack 'O Lantern (punch to turn on and off)"),
tiles = {
@ -250,26 +268,3 @@ if not farming.mcl then
_mcl_blast_resistance = 1
})
end
--- Wooden scarecrow base
minetest.register_node("farming:scarecrow_bottom", {
description = S("Scarecrow Bottom"),
paramtype = "light",
sunlight_propagates = true,
paramtype2 = "facedir",
tiles = {"default_wood.png"},
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {
{-1/16, -8/16, -1/16, 1/16, 8/16, 1/16},
{-12/16, 4/16, -1/16, 12/16, 2/16, 1/16},
}
},
groups = {axey = 1, handy = 1, snappy = 3, flammable = 2},
is_ground_content = false,
_mcl_hardness = 0.8,
_mcl_blast_resistance = 1
})

View File

@ -3,18 +3,6 @@ local a = farming.recipe_items
-- flour recipes
if not farming.mcl then
minetest.register_craft({
output = "farming:flour",
recipe = {
{"farming:wheat", "farming:wheat", "farming:wheat"},
{"farming:wheat", a.mortar_pestle, ""}
},
replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
})
end
minetest.register_craft({
output = "farming:flour",
recipe = {
@ -63,18 +51,6 @@ minetest.register_craft({
recipe = "farming:flour_multigrain"
})
-- bread
if not farming.mcl then
minetest.register_craft({
type = "cooking",
cooktime = 15,
output = "farming:bread",
recipe = "farming:flour"
})
end
-- sliced bread
minetest.register_craft({
@ -196,18 +172,6 @@ minetest.register_craft( {
}
})
-- cocoa beans
if not farming.mcl then
minetest.register_craft({
type = "cooking",
cooktime = 5,
output = "farming:cocoa_beans",
recipe = "farming:cocoa_beans_raw"
})
end
-- bar of dark chocolate
minetest.register_craft( {
@ -217,18 +181,6 @@ minetest.register_craft( {
}
})
-- chocolate cookie
if not farming.mcl then
minetest.register_craft( {
output = "farming:cookie 8",
recipe = {
{"group:food_wheat", "group:food_cocoa", "group:food_wheat" }
}
})
end
-- chocolate block
minetest.register_craft({
@ -279,16 +231,6 @@ minetest.register_craft({
}
})
-- golden carrot
if not farming.mcl then
minetest.register_craft({
output = "farming:carrot_gold",
recipe = {{"group:food_carrot", "default:gold_lump"}}
})
end
-- blueberry pie
minetest.register_craft({
@ -309,19 +251,6 @@ minetest.register_craft({
}
})
-- beetroot soup
if not farming.mcl then
minetest.register_craft({
output = "farming:beetroot_soup",
recipe = {
{"group:food_beetroot", "group:food_beetroot", "group:food_beetroot"},
{"group:food_beetroot", "group:food_bowl", "group:food_beetroot"}
}
})
end
-- tomato soup
minetest.register_craft({
@ -390,18 +319,6 @@ if minetest.get_modpath("bucket_wooden") then
})
end
-- sugar
if not farming.mcl then
minetest.register_craft({
type = "cooking",
cooktime = 3,
output = "farming:sugar 2",
recipe = "default:papyrus"
})
end
-- sugar cube
minetest.register_craft({
@ -901,18 +818,6 @@ minetest.register_craft({
}
})
-- baked potato
if not farming.mcl then
minetest.register_craft({
type = "cooking",
cooktime = 10,
output = "farming:baked_potato",
recipe = "group:food_potato"
})
end
-- potato & cucumber salad
minetest.register_craft({
@ -1065,50 +970,6 @@ minetest.register_craft({
cooktime = 5
})
-- toasted sunflower seeds
if not farming.mcl then
minetest.register_craft({
type = "cooking",
cooktime = 10,
output = "farming:sunflower_seeds_toasted",
recipe = "farming:seed_sunflower"
})
end
-- sunflower oil
if not farming.mcl then
local tmp = "group:food_sunflower_seeds"
minetest.register_craft( {
output = "farming:sunflower_oil",
recipe = {
{tmp, tmp, tmp},
{tmp, tmp, tmp},
{tmp, a.glass_bottle, tmp}
}
})
end
-- sunflower seed bread
if not farming.mcl then
minetest.register_craft({
output = "farming:sunflower_bread",
recipe = {
{
"group:food_sunflower_seeds_toasted",
"group:food_bread",
"group:food_sunflower_seeds_toasted"
}
}
})
end
-- vanilla extract
minetest.register_craft( {
@ -1122,19 +983,6 @@ minetest.register_craft( {
}
})
-- jack 'o lantern
if not farming.mcl then
minetest.register_craft({
output = "farming:jackolantern",
recipe = {
{"default:torch"},
{"group:food_pumpkin"}
}
})
end
-- wooden scarecrow base
minetest.register_craft({
@ -1197,19 +1045,6 @@ minetest.register_craft( {
}
})
-- wooden bowl
if not farming.mcl then
minetest.register_craft({
output = "farming:bowl 4",
recipe = {
{"group:wood", "", "group:wood"},
{"", "group:wood", ""}
}
})
end
-- saucepan
minetest.register_craft({
@ -1376,12 +1211,14 @@ minetest.register_craft( {
-- straw
local tmp = "group:food_wheat"
minetest.register_craft({
output = "farming:straw 3",
recipe = {
{"farming:wheat", "farming:wheat", "farming:wheat"},
{"farming:wheat", "farming:wheat", "farming:wheat"},
{"farming:wheat", "farming:wheat", "farming:wheat"}
{tmp, tmp, tmp},
{tmp, tmp, tmp},
{tmp, tmp, tmp}
}
})
@ -1390,6 +1227,139 @@ minetest.register_craft({
recipe = {{"farming:straw"}}
})
--= Recipes we shouldn't add when using Mineclonia/VoxeLibre
if not farming.mcl then
-- Wheat flour
minetest.register_craft({
output = "farming:flour",
recipe = {
{"farming:wheat", "farming:wheat", "farming:wheat"},
{"farming:wheat", a.mortar_pestle, ""}
},
replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
})
-- Bread
minetest.register_craft({
type = "cooking",
cooktime = 15,
output = "farming:bread",
recipe = "farming:flour"
})
-- Cocoa beans
minetest.register_craft({
type = "cooking",
cooktime = 5,
output = "farming:cocoa_beans",
recipe = "farming:cocoa_beans_raw"
})
-- Chocolate cookie
minetest.register_craft( {
output = "farming:cookie 8",
recipe = {
{"group:food_wheat", "group:food_cocoa", "group:food_wheat" }
}
})
-- Golden carrot
minetest.register_craft({
output = "farming:carrot_gold",
recipe = {{"group:food_carrot", "default:gold_lump"}}
})
-- Beetroot soup
minetest.register_craft({
output = "farming:beetroot_soup",
recipe = {
{"group:food_beetroot", "group:food_beetroot", "group:food_beetroot"},
{"group:food_beetroot", "group:food_bowl", "group:food_beetroot"}
}
})
-- Sugar
minetest.register_craft({
type = "cooking",
cooktime = 3,
output = "farming:sugar 2",
recipe = "default:papyrus"
})
-- Baked potato
minetest.register_craft({
type = "cooking",
cooktime = 10,
output = "farming:baked_potato",
recipe = "group:food_potato"
})
-- Toasted sunflower seeds
minetest.register_craft({
type = "cooking",
cooktime = 10,
output = "farming:sunflower_seeds_toasted",
recipe = "farming:seed_sunflower"
})
-- Sunflower oil
local tmp = "group:food_sunflower_seeds"
minetest.register_craft( {
output = "farming:sunflower_oil",
recipe = {
{tmp, tmp, tmp},
{tmp, tmp, tmp},
{tmp, a.glass_bottle, tmp}
}
})
-- Sunflower seed bread
minetest.register_craft({
output = "farming:sunflower_bread",
recipe = {
{
"group:food_sunflower_seeds_toasted",
"group:food_bread",
"group:food_sunflower_seeds_toasted"
}
}
})
-- Jack 'o lantern
minetest.register_craft({
output = "farming:jackolantern",
recipe = {
{"default:torch"},
{"group:food_pumpkin"}
}
})
-- Wooden bowl
minetest.register_craft({
output = "farming:bowl 4",
recipe = {
{"group:wood", "", "group:wood"},
{"", "group:wood", ""}
}
})
end
-- dye recipes
minetest.register_craft({output = a.dye_green, recipe = {{"farming:beans"}}})