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

@ -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"}}})