add 'farming_use_utensils' setting, added mayonnaise (thx felfa)

This commit is contained in:
tenplus1 2023-07-13 18:07:25 +01:00
parent b2d1289353
commit 8717625d0c
24 changed files with 167 additions and 65 deletions

View File

@ -218,6 +218,7 @@ on an older map are enabled and growing properly.
### Changelog: ### Changelog:
- 1.48 - added 'farming_use_utensils' setting to enable/disable utensils in recipes, added mayonnaise (thx felfa)
- 1.47 - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active, added asparagus; spinach; eggplant (thx Atlante for new textures), Sugar Cube - 1.47 - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active, added asparagus; spinach; eggplant (thx Atlante for new textures), Sugar Cube
- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya, vanilla and sunflowers (thanks Felfa), added tofu, added salt crystals (thanks gorlock) - 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya, vanilla and sunflowers (thanks Felfa), added tofu, added salt crystals (thanks gorlock)
- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy - 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy

View File

@ -27,12 +27,14 @@ minetest.register_craftitem("farming:barley", {
groups = {food_barley = 1, flammable = 2} groups = {food_barley = 1, flammable = 2}
}) })
local tmp = farming.use_utensils and "farming:mortar_pestle" or ""
-- flour -- flour
minetest.register_craft({ minetest.register_craft({
output = "farming:flour", output = "farming:flour",
recipe = { recipe = {
{"farming:barley", "farming:barley", "farming:barley"}, {"farming:barley", "farming:barley", "farming:barley"},
{"farming:barley", "farming:mortar_pestle", ""} {"farming:barley", tmp, ""}
}, },
replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
}) })

View File

@ -34,11 +34,13 @@ minetest.register_craftitem("farming:blueberry_pie", {
on_use = minetest.item_eat(6) on_use = minetest.item_eat(6)
}) })
local tmp = farming.use_utensils and "farming:baking_tray" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:blueberry_pie", output = "farming:blueberry_pie",
recipe = { recipe = {
{"group:food_flour", "group:food_sugar", "group:food_blueberries"}, {"group:food_flour", "group:food_sugar", "group:food_blueberries"},
{"group:food_baking_tray", "", ""} {"", tmp, ""}
}, },
replacements = {{"group:food_baking_tray", "farming:baking_tray"}} replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
}) })

View File

@ -25,11 +25,13 @@ minetest.register_craftitem("farming:carrot_juice", {
groups = {vessel = 1, drink = 1} groups = {vessel = 1, drink = 1}
}) })
local tmp = farming.use_utensils and "farming:juicer" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:carrot_juice", output = "farming:carrot_juice",
recipe = { recipe = {
{tmp},
{"group:food_carrot"}, {"group:food_carrot"},
{"farming:juicer"},
{"vessels:drinking_glass"} {"vessels:drinking_glass"}
}, },
replacements = { replacements = {

View File

@ -40,10 +40,12 @@ minetest.register_craftitem("farming:chili_powder", {
inventory_image = "farming_chili_powder.png" inventory_image = "farming_chili_powder.png"
}) })
local tmp = farming.use_utensils and "farming:mortar_pestle" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:chili_powder", output = "farming:chili_powder",
recipe = { recipe = {
{"farming:chili_pepper", "farming:mortar_pestle"} {"farming:chili_pepper", tmp}
}, },
replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}} replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}}
}) })

View File

@ -32,10 +32,12 @@ minetest.register_node("farming:coffee_cup", {
minetest.register_alias("farming:coffee_cup_hot", "farming:coffee_cup") minetest.register_alias("farming:coffee_cup_hot", "farming:coffee_cup")
minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass") minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass")
local tmp = farming.use_utensils and "farming:saucepan" or ""
minetest.register_craft( { minetest.register_craft( {
output = "farming:coffee_cup", output = "farming:coffee_cup",
recipe = { recipe = {
{"group:food_saucepan", "group:food_coffee", "group:food_water_glass"} {"group:food_coffee", "group:food_water_glass", tmp}
}, },
replacements = { replacements = {
{"group:food_saucepan", "farming:saucepan"} {"group:food_saucepan", "farming:saucepan"}

View File

@ -40,10 +40,12 @@ minetest.register_craftitem("farming:popcorn", {
on_use = minetest.item_eat(4) on_use = minetest.item_eat(4)
}) })
local tmp = farming.use_utensils and "farming:pot" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:popcorn", output = "farming:popcorn",
recipe = { recipe = {
{"group:food_pot", "group:food_oil", "group:food_corn"} {"group:food_oil", "group:food_corn", tmp}
}, },
replacements = { replacements = {
{"group:food_pot", "farming:pot"}, {"group:food_pot", "farming:pot"},
@ -58,10 +60,13 @@ minetest.register_craftitem("farming:cornstarch", {
groups = {food_cornstarch = 1, food_gelatin = 1, flammable = 2} groups = {food_cornstarch = 1, food_gelatin = 1, flammable = 2}
}) })
tmp = farming.use_utensils and "farming:mortar_pestle" or ""
local tmp2 = farming.use_utensils and "farming:baking_tray" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:cornstarch", output = "farming:cornstarch",
recipe = { recipe = {
{"group:food_mortar_pestle", "group:food_corn_cooked", "group:food_baking_tray"}, {tmp, "group:food_corn_cooked", tmp2},
{"", "group:food_bowl", ""}, {"", "group:food_bowl", ""},
}, },
replacements = { replacements = {

View File

@ -48,8 +48,8 @@ def.groups.growing = nil
def.selection_box = farming.select_final def.selection_box = farming.select_final
def.drop = { def.drop = {
items = { items = {
{items = {'farming:lettuce 2'}, rarity = 1}, {items = {"farming:lettuce 2"}, rarity = 1},
{items = {'farming:lettuce 1'}, rarity = 2} {items = {"farming:lettuce 1"}, rarity = 2}
} }
} }
minetest.register_node("farming:lettuce_5", table.copy(def)) minetest.register_node("farming:lettuce_5", table.copy(def))

View File

@ -20,9 +20,11 @@ minetest.register_craft({
} }
}) })
local tmp = farming.use_utensils and "farming:cutting_board" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:melon_slice 4", output = "farming:melon_slice 4",
recipe = {{"farming:cutting_board", "farming:melon_8"}}, recipe = {{"farming:melon_8", tmp}},
replacements = {{"farming:cutting_board", "farming:cutting_board"}} replacements = {{"farming:cutting_board", "farming:cutting_board"}}
}) })

View File

@ -35,11 +35,13 @@ minetest.register_craftitem("farming:mint_tea", {
groups = {flammable = 4} groups = {flammable = 4}
}) })
local tmp = farming.use_utensils and "farming:juicer" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:mint_tea", output = "farming:mint_tea",
recipe = { recipe = {
{"group:food_mint", "group:food_mint", "group:food_mint"}, {"group:food_mint", "group:food_mint", "group:food_mint"},
{"group:food_water_glass", "farming:juicer", ""} {"group:food_water_glass", tmp, ""}
}, },
replacements = { replacements = {
{"group:food_juicer", "farming:juicer"} {"group:food_juicer", "farming:juicer"}

View File

@ -26,12 +26,14 @@ minetest.register_craftitem("farming:onion_soup", {
on_use = minetest.item_eat(6, "farming:bowl") on_use = minetest.item_eat(6, "farming:bowl")
}) })
local tmp = farming.use_utensils and "farming:pot" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:onion_soup", output = "farming:onion_soup",
recipe = { recipe = {
{"group:food_onion", "group:food_onion", "group:food_onion"}, {"group:food_onion", "group:food_onion", "group:food_onion"},
{"group:food_onion", "group:food_pot", "group:food_onion"}, {"group:food_onion", "group:food_bowl", "group:food_onion"},
{"", "group:food_bowl", ""} {"", tmp, ""}
}, },
replacements = {{"farming:pot", "farming:pot"}} replacements = {{"farming:pot", "farming:pot"}}
}) })

View File

@ -66,12 +66,14 @@ minetest.register_node("farming:pepper_ground", {
} }
}) })
local tmp = farming.use_utensils and "farming:mortar_pestle" or ""
minetest.register_craft( { minetest.register_craft( {
output = "farming:pepper_ground", output = "farming:pepper_ground",
recipe = { recipe = {
{"group:food_peppercorn"}, {"group:food_peppercorn"},
{"farming:mortar_pestle"}, {"vessels:glass_bottle"},
{"vessels:glass_bottle"} {tmp}
}, },
replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
}) })

View File

@ -50,13 +50,15 @@ minetest.register_craftitem("farming:pineapple_juice", {
groups = {vessel = 1, drink = 1} groups = {vessel = 1, drink = 1}
}) })
local tmp = farming.use_utensils and "farming:juicer" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:pineapple_juice", output = "farming:pineapple_juice",
recipe = { recipe = {
{"group:food_pineapple_ring", "group:food_pineapple_ring", {"group:food_pineapple_ring", "group:food_pineapple_ring",
"group:food_pineapple_ring"}, "group:food_pineapple_ring"},
{"", "farming:juicer", ""}, {"", "vessels:drinking_glass", ""},
{"", "vessels:drinking_glass", ""} {"", tmp, ""}
}, },
replacements = { replacements = {
{"group:food_juicer", "farming:juicer"} {"group:food_juicer", "farming:juicer"}
@ -67,8 +69,8 @@ minetest.register_craft({
output = "farming:pineapple_juice 2", output = "farming:pineapple_juice 2",
recipe = { recipe = {
{"group:food_pineapple", ""}, {"group:food_pineapple", ""},
{"farming:juicer", ""}, {"vessels:drinking_glass", "vessels:drinking_glass"},
{"vessels:drinking_glass", "vessels:drinking_glass"} {tmp, ""}
}, },
replacements = { replacements = {
{"group:food_juicer", "farming:juicer"} {"group:food_juicer", "farming:juicer"}

View File

@ -20,9 +20,11 @@ minetest.register_craft({
} }
}) })
local tmp = farming.use_utensils and "farming:cutting_board" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:pumpkin_slice 4", output = "farming:pumpkin_slice 4",
recipe = {{"farming:cutting_board", "farming:pumpkin"}}, recipe = {{"farming:pumpkin", tmp}},
replacements = {{"farming:cutting_board", "farming:cutting_board"}} replacements = {{"farming:cutting_board", "farming:cutting_board"}}
}) })

View File

@ -19,10 +19,12 @@ minetest.register_craftitem("farming:rhubarb_pie", {
on_use = minetest.item_eat(6) on_use = minetest.item_eat(6)
}) })
local tmp = farming.use_utensils and "farming:baking_tray" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:rhubarb_pie", output = "farming:rhubarb_pie",
recipe = { recipe = {
{"farming:baking_tray", "group:food_sugar", ""}, {tmp, "group:food_sugar", ""},
{"group:food_rhubarb", "group:food_rhubarb", "group:food_rhubarb"}, {"group:food_rhubarb", "group:food_rhubarb", "group:food_rhubarb"},
{"group:food_wheat", "group:food_wheat", "group:food_wheat"} {"group:food_wheat", "group:food_wheat", "group:food_wheat"}
}, },

View File

@ -49,11 +49,13 @@ minetest.register_craftitem("farming:rice_flour", {
groups = {food_rice_flour = 1, flammable = 1} groups = {food_rice_flour = 1, flammable = 1}
}) })
local tmp = farming.use_utensils and "farming:mortar_pestle" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:rice_flour", output = "farming:rice_flour",
recipe = { recipe = {
{"farming:rice", "farming:rice", "farming:rice"}, {"farming:rice", "farming:rice", "farming:rice"},
{"farming:rice", "farming:mortar_pestle", ""} {"farming:rice", tmp, ""}
}, },
replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
}) })

View File

@ -22,11 +22,13 @@ minetest.override_item("farming:rye_1", {drop = {}})
minetest.override_item("farming:rye_2", {drop = {}}) minetest.override_item("farming:rye_2", {drop = {}})
minetest.override_item("farming:rye_3", {drop = {}}) minetest.override_item("farming:rye_3", {drop = {}})
local tmp = farming.use_utensils and "farming:mortar_pestle" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:flour", output = "farming:flour",
recipe = { recipe = {
{"farming:rye", "farming:rye", "farming:rye"}, {"farming:rye", "farming:rye", "farming:rye"},
{"farming:rye", "farming:mortar_pestle", ""} {"farming:rye", tmp, ""}
}, },
replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
}) })
@ -54,7 +56,7 @@ minetest.register_craft({
output = "farming:flour", output = "farming:flour",
recipe = { recipe = {
{"farming:oat", "farming:oat", "farming:oat"}, {"farming:oat", "farming:oat", "farming:oat"},
{"farming:oat", "farming:mortar_pestle", ""} {"farming:oat", tmp, ""}
}, },
replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
}) })
@ -72,7 +74,7 @@ minetest.register_craft({
output = "farming:flour_multigrain", output = "farming:flour_multigrain",
recipe = { recipe = {
"farming:wheat", "farming:barley", "farming:oat", "farming:wheat", "farming:barley", "farming:oat",
"farming:rye", "farming:mortar_pestle" "farming:rye", tmp
}, },
replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
}) })

View File

@ -33,13 +33,14 @@ minetest.register_node("farming:soy_sauce", {
sounds = default.node_sound_glass_defaults() sounds = default.node_sound_glass_defaults()
}) })
local tmp = farming.use_utensils and "farming:juicer" or ""
-- soy sauce recipe -- soy sauce recipe
minetest.register_craft( { minetest.register_craft( {
output = "farming:soy_sauce", output = "farming:soy_sauce",
recipe = { recipe = {
{"group:food_soy", "group:food_salt", "group:food_soy"}, {"group:food_soy", "group:food_salt", "group:food_soy"},
{"", "group:food_juicer", ""}, {tmp, "bucket:bucket_water", "vessels:glass_bottle"}
{"", "bucket:bucket_water", "vessels:glass_bottle"}
}, },
replacements = { replacements = {
{"bucket:bucket_water", "bucket:bucket_empty"}, {"bucket:bucket_water", "bucket:bucket_empty"},
@ -88,11 +89,13 @@ minetest.register_craftitem("farming:tofu", {
on_use = minetest.item_eat(3) on_use = minetest.item_eat(3)
}) })
tmp = farming.use_utensils and "farming:baking_tray" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:tofu", output = "farming:tofu",
recipe = { recipe = {
{"farming:baking_tray", "group:food_soy", "group:food_soy"}, {"group:food_soy", "group:food_soy", "group:food_soy"},
{"group:food_soy", "group:food_soy", "group:food_soy"} {"group:food_soy", "group:food_soy", tmp}
}, },
replacements = {{"farming:baking_tray", "farming:baking_tray"}} replacements = {{"farming:baking_tray", "farming:baking_tray"}}
}) })

View File

@ -78,11 +78,13 @@ minetest.register_craftitem("farming:flour", {
groups = {food_flour = 1, flammable = 1} groups = {food_flour = 1, flammable = 1}
}) })
local tmp = farming.use_utensils and "farming:mortar_pestle" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:flour", output = "farming:flour",
recipe = { recipe = {
{"farming:wheat", "farming:wheat", "farming:wheat"}, {"farming:wheat", "farming:wheat", "farming:wheat"},
{"farming:wheat", "farming:mortar_pestle", ""} {"farming:wheat", tmp, ""}
}, },
replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
}) })
@ -110,9 +112,11 @@ minetest.register_craftitem("farming:bread_slice", {
groups = {food_bread_slice = 1, flammable = 2} groups = {food_bread_slice = 1, flammable = 2}
}) })
tmp = farming.use_utensils and "farming:cutting_board" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:bread_slice 5", output = "farming:bread_slice 5",
recipe = {{"group:food_cutting_board", "farming:bread"}}, recipe = {{"farming:bread", tmp}},
replacements = {{"group:food_cutting_board", "farming:cutting_board"}} replacements = {{"group:food_cutting_board", "farming:cutting_board"}}
}) })

121
food.lua
View File

@ -1,7 +1,8 @@
local S = farming.intllib local S = farming.intllib
local tmp
--= filter sea water into river water -- filter sea water into river water
minetest.register_craft({ minetest.register_craft({
output = "bucket:bucket_river_water", output = "bucket:bucket_river_water",
@ -12,7 +13,7 @@ minetest.register_craft({
} }
}) })
--= glass of water -- glass of water
minetest.register_craftitem("farming:glass_water", { minetest.register_craftitem("farming:glass_water", {
description = S("Glass of Water"), description = S("Glass of Water"),
@ -53,7 +54,7 @@ if minetest.get_modpath("bucket_wooden") then
}) })
end end
--= Sugar -- Sugar
minetest.register_craftitem("farming:sugar", { minetest.register_craftitem("farming:sugar", {
description = S("Sugar"), description = S("Sugar"),
@ -90,7 +91,7 @@ minetest.register_craft({
recipe = {{"farming:sugar_cube"}} recipe = {{"farming:sugar_cube"}}
}) })
--= Sugar caramel -- Sugar caramel
minetest.register_craftitem("farming:caramel", { minetest.register_craftitem("farming:caramel", {
description = S("Caramel"), description = S("Caramel"),
@ -104,7 +105,7 @@ minetest.register_craft({
recipe = "group:food_sugar" recipe = "group:food_sugar"
}) })
--= Salt -- Salt
minetest.register_node("farming:salt", { minetest.register_node("farming:salt", {
description = S("Salt"), description = S("Salt"),
@ -172,7 +173,7 @@ minetest.register_craft({
replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
}) })
--= Salt Crystal -- Salt Crystal
minetest.register_node("farming:salt_crystal", { minetest.register_node("farming:salt_crystal", {
description = ("Salt crystal"), description = ("Salt crystal"),
@ -191,10 +192,12 @@ minetest.register_node("farming:salt_crystal", {
} }
}) })
tmp = farming.use_utensils and "farming:mortar_pestle" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:salt 9", output = "farming:salt 9",
recipe = { recipe = {
{"farming:salt_crystal", "farming:mortar_pestle"} {"farming:salt_crystal", tmp}
}, },
replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}} replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}}
}) })
@ -208,7 +211,36 @@ minetest.register_craft({
} }
}) })
--= Rose Water -- Mayonnaise
minetest.register_node("farming:mayonnaise", {
description = S("Mayonnaise"),
drawtype = "plantlike",
tiles = {"farming_mayo.png"},
inventory_image = "farming_mayo.png",
wield_image = "farming_mayo.png",
paramtype = "light",
is_ground_content = false,
walkable = false,
on_use = minetest.item_eat(3),
selection_box = {
type = "fixed",
fixed = {-0.25, -0.5, -0.25, 0.25, 0.45, 0.25}
},
groups = {food_mayonnaise = 1, vessel = 1, dig_immediate = 3, attached_node = 1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_craft({
output = "farming:mayonnaise",
recipe = {
{"group:food_olive_oil", "group:food_lemon"},
{"group:food_egg", "farming:salt"}
},
replacements = {{"farming:olive_oil", "vessels:glass_bottle"}}
})
-- Rose Water
minetest.register_node("farming:rose_water", { minetest.register_node("farming:rose_water", {
description = S("Rose Water"), description = S("Rose Water"),
@ -227,12 +259,14 @@ minetest.register_node("farming:rose_water", {
} }
}) })
tmp = farming.use_utensils and "farming:pot" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:rose_water", output = "farming:rose_water",
recipe = { recipe = {
{"flowers:rose", "flowers:rose", "flowers:rose"}, {"flowers:rose", "flowers:rose", "flowers:rose"},
{"flowers:rose", "flowers:rose", "flowers:rose"}, {"flowers:rose", "flowers:rose", "flowers:rose"},
{"group:food_water_glass", "group:food_pot", "vessels:glass_bottle"} {"group:food_water_glass", tmp, "vessels:glass_bottle"}
}, },
replacements = { replacements = {
{"group:food_water_glass", "vessels:drinking_glass"}, {"group:food_water_glass", "vessels:drinking_glass"},
@ -240,7 +274,7 @@ minetest.register_craft({
} }
}) })
--= Turkish Delight -- Turkish Delight
minetest.register_craftitem("farming:turkish_delight", { minetest.register_craftitem("farming:turkish_delight", {
description = S("Turkish Delight"), description = S("Turkish Delight"),
@ -263,7 +297,7 @@ minetest.register_craft({
} }
}) })
--= Garlic Bread -- Garlic Bread
minetest.register_craftitem("farming:garlic_bread", { minetest.register_craftitem("farming:garlic_bread", {
description = S("Garlic Bread"), description = S("Garlic Bread"),
@ -279,7 +313,7 @@ minetest.register_craft({
} }
}) })
--= Donuts (thanks to Bockwurst for making the donut images) -- Donuts (thanks to Bockwurst for making the donut images)
minetest.register_craftitem("farming:donut", { minetest.register_craftitem("farming:donut", {
description = S("Donut"), description = S("Donut"),
@ -324,7 +358,7 @@ minetest.register_craft({
} }
}) })
--= Porridge Oats -- Porridge Oats
minetest.register_craftitem("farming:porridge", { minetest.register_craftitem("farming:porridge", {
description = S("Porridge"), description = S("Porridge"),
@ -344,7 +378,7 @@ minetest.register_craft({
} }
}) })
--= Jaffa Cake -- Jaffa Cake
minetest.register_craftitem("farming:jaffa_cake", { minetest.register_craftitem("farming:jaffa_cake", {
description = S("Jaffa Cake"), description = S("Jaffa Cake"),
@ -352,10 +386,12 @@ minetest.register_craftitem("farming:jaffa_cake", {
on_use = minetest.item_eat(6) on_use = minetest.item_eat(6)
}) })
tmp = farming.use_utensils and "farming:baking_tray" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:jaffa_cake 3", output = "farming:jaffa_cake 3",
recipe = { recipe = {
{"farming:baking_tray", "group:food_egg", "group:food_sugar"}, {tmp, "group:food_egg", "group:food_sugar"},
{"group:food_flour", "group:food_cocoa", "group:food_orange"}, {"group:food_flour", "group:food_cocoa", "group:food_orange"},
{"group:food_milk", "", ""} {"group:food_milk", "", ""}
}, },
@ -375,11 +411,13 @@ minetest.register_craftitem("farming:apple_pie", {
on_use = minetest.item_eat(6) on_use = minetest.item_eat(6)
}) })
tmp = farming.use_utensils and "farming:baking_tray" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:apple_pie", output = "farming:apple_pie",
recipe = { recipe = {
{"group:food_flour", "group:food_sugar", "group:food_apple"}, {"group:food_flour", "group:food_sugar", "group:food_apple"},
{"", "group:food_baking_tray", ""} {"", tmp, ""}
}, },
replacements = {{"group:food_baking_tray", "farming:baking_tray"}} replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
}) })
@ -399,11 +437,13 @@ minetest.register_craftitem("farming:cactus_juice", {
end end
}) })
tmp = farming.use_utensils and "farming:juicer" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:cactus_juice", output = "farming:cactus_juice",
recipe = { recipe = {
{tmp},
{"default:cactus"}, {"default:cactus"},
{"farming:juicer"},
{"vessels:drinking_glass"} {"vessels:drinking_glass"}
}, },
replacements = { replacements = {
@ -419,10 +459,12 @@ minetest.register_craftitem("farming:pasta", {
groups = {food_pasta = 1} groups = {food_pasta = 1}
}) })
tmp = farming.use_utensils and "farming:mixing_bowl" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:pasta", output = "farming:pasta",
recipe = { recipe = {
{"group:food_flour", "group:food_butter", "group:food_mixing_bowl"} {"group:food_flour", "group:food_butter", tmp}
}, },
replacements = {{"group:food_mixing_bowl", "farming:mixing_bowl"}} replacements = {{"group:food_mixing_bowl", "farming:mixing_bowl"}}
}) })
@ -461,10 +503,12 @@ minetest.register_craftitem("farming:spaghetti", {
on_use = minetest.item_eat(8) on_use = minetest.item_eat(8)
}) })
tmp = farming.use_utensils and "farming:saucepan" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:spaghetti", output = "farming:spaghetti",
recipe = { recipe = {
{"group:food_pasta", "group:food_saucepan", "group:food_tomato"}, {"group:food_pasta", "group:food_tomato", tmp},
{"group:food_garlic_clove", "group:food_garlic_clove", ""} {"group:food_garlic_clove", "group:food_garlic_clove", ""}
}, },
replacements = {{"group:food_saucepan", "farming:saucepan"}} replacements = {{"group:food_saucepan", "farming:saucepan"}}
@ -478,10 +522,12 @@ minetest.register_craftitem("farming:bibimbap", {
on_use = minetest.item_eat(8, "farming:bowl") on_use = minetest.item_eat(8, "farming:bowl")
}) })
tmp = farming.use_utensils and "farming:skillet" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:bibimbap", output = "farming:bibimbap",
recipe = { recipe = {
{"group:food_skillet", "group:food_bowl", "group:food_egg"}, {tmp, "group:food_bowl", "group:food_egg"},
{"group:food_rice", "group:food_chicken_raw", "group:food_cabbage"}, {"group:food_rice", "group:food_chicken_raw", "group:food_cabbage"},
{"group:food_carrot", "group:food_chili_pepper", ""} {"group:food_carrot", "group:food_chili_pepper", ""}
}, },
@ -492,7 +538,7 @@ minetest.register_craft({
output = "farming:bibimbap", output = "farming:bibimbap",
type = "shapeless", type = "shapeless",
recipe = { recipe = {
"group:food_skillet", "group:food_bowl", "group:food_mushroom", tmp, "group:food_bowl", "group:food_mushroom",
"group:food_rice", "group:food_cabbage", "group:food_carrot", "group:food_rice", "group:food_cabbage", "group:food_carrot",
"group:food_mushroom", "group:food_chili_pepper" "group:food_mushroom", "group:food_chili_pepper"
}, },
@ -560,13 +606,15 @@ minetest.register_craftitem("farming:spanish_potatoes", {
on_use = minetest.item_eat(8, "farming:bowl"), on_use = minetest.item_eat(8, "farming:bowl"),
}) })
tmp = farming.use_utensils and "farming:skillet" or ""
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = "farming:spanish_potatoes", output = "farming:spanish_potatoes",
recipe = { recipe = {
"farming:potato", "group:food_parsley", "farming:potato", "farming:potato", "group:food_parsley", "farming:potato",
"group:food_egg", "group:food_flour", "farming:onion", "group:food_egg", "group:food_flour", "farming:onion",
"farming:garlic_clove", "group:food_bowl", "group:food_skillet" "farming:garlic_clove", "group:food_bowl", tmp
}, },
replacements = {{"group:food_skillet", "farming:skillet"}} replacements = {{"group:food_skillet", "farming:skillet"}}
}) })
@ -579,12 +627,14 @@ minetest.register_craftitem("farming:potato_omelet", {
on_use = minetest.item_eat(6, "farming:bowl") on_use = minetest.item_eat(6, "farming:bowl")
}) })
tmp = farming.use_utensils and "farming:skillet" or ""
minetest.register_craft({ minetest.register_craft({
type = "shapeless",
output = "farming:potato_omelet", output = "farming:potato_omelet",
recipe = { recipe = {
"group:food_egg", "farming:potato", "group:food_onion", {"group:food_egg", "farming:potato", "group:food_onion"},
"group:food_skillet", "group:food_bowl"}, {tmp, "group:food_bowl", ""}
},
replacements = {{"group:food_skillet", "farming:skillet"}} replacements = {{"group:food_skillet", "farming:skillet"}}
}) })
@ -596,12 +646,14 @@ minetest.register_craftitem("farming:paella", {
on_use = minetest.item_eat(8, "farming:bowl") on_use = minetest.item_eat(8, "farming:bowl")
}) })
tmp = farming.use_utensils and "farming:skillet" or ""
minetest.register_craft({ minetest.register_craft({
type = "shapeless",
output = "farming:paella", output = "farming:paella",
recipe = { recipe = {
"group:food_rice", "dye:orange", "farming:pepper_red", {"group:food_rice", "dye:orange", "farming:pepper_red"},
"group:food_peas", "group:food_chicken", "group:food_bowl", "group:food_skillet" {"group:food_peas", "group:food_chicken", "group:food_bowl"},
{"", tmp, ""}
}, },
replacements = {{"group:food_skillet", "farming:skillet"}} replacements = {{"group:food_skillet", "farming:skillet"}}
}) })
@ -637,13 +689,14 @@ minetest.register_craftitem("farming:cheese_vegan", {
groups = {food_cheese = 1, flammable = 2} groups = {food_cheese = 1, flammable = 2}
}) })
tmp = farming.use_utensils and "farming:pot" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:cheese_vegan", output = "farming:cheese_vegan",
recipe = { recipe = {
{"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"},
{"group:food_salt", "group:food_peppercorn", "farming:bottle_ethanol"}, {"group:food_salt", "group:food_peppercorn", "farming:bottle_ethanol"},
{"group:food_gelatin", "group:food_pot", ""} {"group:food_gelatin", tmp, ""}
}, },
replacements = { replacements = {
{"farming:soy_milk", "vessels:drinking_glass 3"}, {"farming:soy_milk", "vessels:drinking_glass 3"},
@ -657,7 +710,7 @@ minetest.register_craft({
recipe = { recipe = {
{"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"},
{"group:food_salt", "group:food_peppercorn", "group:food_lemon"}, {"group:food_salt", "group:food_peppercorn", "group:food_lemon"},
{"group:food_gelatin", "group:food_pot", ""} {"group:food_gelatin", tmp, ""}
}, },
replacements = { replacements = {
{"farming:soy_milk", "vessels:drinking_glass 3"}, {"farming:soy_milk", "vessels:drinking_glass 3"},
@ -691,12 +744,14 @@ minetest.register_craftitem("farming:gyoza", {
groups = {flammable = 2} groups = {flammable = 2}
}) })
tmp = farming.use_utensils and "farming:skillet" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:gyoza 4", output = "farming:gyoza 4",
recipe = { recipe = {
{"group:food_cabbage", "group:food_garlic_clove", "group:food_onion"}, {"group:food_cabbage", "group:food_garlic_clove", "group:food_onion"},
{"group:food_meat_raw", "group:food_salt", "group:food_flour"}, {"group:food_meat_raw", "group:food_salt", "group:food_flour"},
{"", "group:food_skillet", ""} {"", tmp, ""}
}, },
replacements = { replacements = {
@ -713,11 +768,13 @@ minetest.register_craftitem("farming:mochi", {
groups = {flammable = 2} groups = {flammable = 2}
}) })
tmp = farming.use_utensils and "farming:mortar_pestle" or ""
minetest.register_craft({ minetest.register_craft({
output = "farming:mochi", output = "farming:mochi",
recipe = { recipe = {
{"", tmp, ""},
{"group:food_rice", "group:food_sugar", "group:food_rice"}, {"group:food_rice", "group:food_sugar", "group:food_rice"},
{"", "group:food_mortar_pestle", ""},
{"", "farming:glass_water", ""} {"", "farming:glass_water", ""}
}, },
replacements = { replacements = {

View File

@ -7,7 +7,7 @@
farming = { farming = {
mod = "redo", mod = "redo",
version = "20230407", version = "20230713",
path = minetest.get_modpath("farming"), path = minetest.get_modpath("farming"),
select = { select = {
type = "fixed", type = "fixed",
@ -20,7 +20,8 @@ farming = {
registered_plants = {}, registered_plants = {},
min_light = 12, min_light = 12,
max_light = 15, max_light = 15,
mapgen = minetest.get_mapgen_setting("mg_name") mapgen = minetest.get_mapgen_setting("mg_name"),
use_utensils = minetest.settings:get_bool("farming_use_utensils") ~= false
} }

View File

@ -174,6 +174,7 @@ Created by Felfa (CC0)
farming_spanish_potatoes.png farming_spanish_potatoes.png
farming_vanilla_flan.png farming_vanilla_flan.png
farming_sunflower*.png farming_sunflower*.png
farming_mayo.png
Created by gorlock (CC0) Created by gorlock (CC0)
farming_salt_crystal.png farming_salt_crystal.png

View File

@ -1,2 +1,4 @@
# Contains a value used for speed of crop growth in seconds # Contains a value used for speed of crop growth in seconds
farming_stage_length (Farming Stage Length) float 160.0 farming_stage_length (Farming Stage Length) float 160.0
farming_use_utensils (Use utensil recipes) bool true

BIN
textures/farming_mayo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 B