diff --git a/README.md b/README.md index 56c20d2..8744844 100644 --- a/README.md +++ b/README.md @@ -218,6 +218,7 @@ on an older map are enabled and growing properly. ### 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.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 diff --git a/crops/barley.lua b/crops/barley.lua index cf2d932..2697413 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -27,12 +27,14 @@ minetest.register_craftitem("farming:barley", { groups = {food_barley = 1, flammable = 2} }) +local tmp = farming.use_utensils and "farming:mortar_pestle" or "" + -- flour minetest.register_craft({ output = "farming:flour", recipe = { {"farming:barley", "farming:barley", "farming:barley"}, - {"farming:barley", "farming:mortar_pestle", ""} + {"farming:barley", tmp, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/blueberry.lua b/crops/blueberry.lua index 1713bd1..ef19131 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -34,11 +34,13 @@ minetest.register_craftitem("farming:blueberry_pie", { on_use = minetest.item_eat(6) }) +local tmp = farming.use_utensils and "farming:baking_tray" or "" + minetest.register_craft({ output = "farming:blueberry_pie", recipe = { {"group:food_flour", "group:food_sugar", "group:food_blueberries"}, - {"group:food_baking_tray", "", ""} + {"", tmp, ""} }, replacements = {{"group:food_baking_tray", "farming:baking_tray"}} }) diff --git a/crops/carrot.lua b/crops/carrot.lua index 0f53c87..1141bdc 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -25,11 +25,13 @@ minetest.register_craftitem("farming:carrot_juice", { groups = {vessel = 1, drink = 1} }) +local tmp = farming.use_utensils and "farming:juicer" or "" + minetest.register_craft({ output = "farming:carrot_juice", recipe = { + {tmp}, {"group:food_carrot"}, - {"farming:juicer"}, {"vessels:drinking_glass"} }, replacements = { diff --git a/crops/chili.lua b/crops/chili.lua index 21aa371..547ca4c 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -40,10 +40,12 @@ minetest.register_craftitem("farming:chili_powder", { inventory_image = "farming_chili_powder.png" }) +local tmp = farming.use_utensils and "farming:mortar_pestle" or "" + minetest.register_craft({ output = "farming:chili_powder", recipe = { - {"farming:chili_pepper", "farming:mortar_pestle"} + {"farming:chili_pepper", tmp} }, replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/coffee.lua b/crops/coffee.lua index 64d4e13..d0f2db5 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -32,10 +32,12 @@ minetest.register_node("farming:coffee_cup", { minetest.register_alias("farming:coffee_cup_hot", "farming:coffee_cup") minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass") +local tmp = farming.use_utensils and "farming:saucepan" or "" + minetest.register_craft( { output = "farming:coffee_cup", recipe = { - {"group:food_saucepan", "group:food_coffee", "group:food_water_glass"} + {"group:food_coffee", "group:food_water_glass", tmp} }, replacements = { {"group:food_saucepan", "farming:saucepan"} diff --git a/crops/corn.lua b/crops/corn.lua index b124e19..1390100 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -40,10 +40,12 @@ minetest.register_craftitem("farming:popcorn", { on_use = minetest.item_eat(4) }) +local tmp = farming.use_utensils and "farming:pot" or "" + minetest.register_craft({ output = "farming:popcorn", recipe = { - {"group:food_pot", "group:food_oil", "group:food_corn"} + {"group:food_oil", "group:food_corn", tmp} }, replacements = { {"group:food_pot", "farming:pot"}, @@ -58,10 +60,13 @@ minetest.register_craftitem("farming:cornstarch", { 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({ output = "farming:cornstarch", recipe = { - {"group:food_mortar_pestle", "group:food_corn_cooked", "group:food_baking_tray"}, + {tmp, "group:food_corn_cooked", tmp2}, {"", "group:food_bowl", ""}, }, replacements = { diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 9e3d314..02f68c0 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -48,8 +48,8 @@ def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { - {items = {'farming:lettuce 2'}, rarity = 1}, - {items = {'farming:lettuce 1'}, rarity = 2} + {items = {"farming:lettuce 2"}, rarity = 1}, + {items = {"farming:lettuce 1"}, rarity = 2} } } minetest.register_node("farming:lettuce_5", table.copy(def)) diff --git a/crops/melon.lua b/crops/melon.lua index dd81ecb..52b41b3 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -20,9 +20,11 @@ minetest.register_craft({ } }) +local tmp = farming.use_utensils and "farming:cutting_board" or "" + minetest.register_craft({ output = "farming:melon_slice 4", - recipe = {{"farming:cutting_board", "farming:melon_8"}}, + recipe = {{"farming:melon_8", tmp}}, replacements = {{"farming:cutting_board", "farming:cutting_board"}} }) diff --git a/crops/mint.lua b/crops/mint.lua index a0057a5..2352f51 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -35,11 +35,13 @@ minetest.register_craftitem("farming:mint_tea", { groups = {flammable = 4} }) +local tmp = farming.use_utensils and "farming:juicer" or "" + minetest.register_craft({ output = "farming:mint_tea", recipe = { {"group:food_mint", "group:food_mint", "group:food_mint"}, - {"group:food_water_glass", "farming:juicer", ""} + {"group:food_water_glass", tmp, ""} }, replacements = { {"group:food_juicer", "farming:juicer"} diff --git a/crops/onion.lua b/crops/onion.lua index 2b6fd91..1884bae 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -26,12 +26,14 @@ minetest.register_craftitem("farming:onion_soup", { on_use = minetest.item_eat(6, "farming:bowl") }) +local tmp = farming.use_utensils and "farming:pot" or "" + minetest.register_craft({ output = "farming:onion_soup", recipe = { {"group:food_onion", "group:food_onion", "group:food_onion"}, - {"group:food_onion", "group:food_pot", "group:food_onion"}, - {"", "group:food_bowl", ""} + {"group:food_onion", "group:food_bowl", "group:food_onion"}, + {"", tmp, ""} }, replacements = {{"farming:pot", "farming:pot"}} }) diff --git a/crops/pepper.lua b/crops/pepper.lua index b5a4298..38a4806 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -66,12 +66,14 @@ minetest.register_node("farming:pepper_ground", { } }) +local tmp = farming.use_utensils and "farming:mortar_pestle" or "" + minetest.register_craft( { output = "farming:pepper_ground", recipe = { {"group:food_peppercorn"}, - {"farming:mortar_pestle"}, - {"vessels:glass_bottle"} + {"vessels:glass_bottle"}, + {tmp} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/pineapple.lua b/crops/pineapple.lua index f77bf5e..738e65f 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -50,13 +50,15 @@ minetest.register_craftitem("farming:pineapple_juice", { groups = {vessel = 1, drink = 1} }) +local tmp = farming.use_utensils and "farming:juicer" or "" + minetest.register_craft({ output = "farming:pineapple_juice", recipe = { {"group:food_pineapple_ring", "group:food_pineapple_ring", "group:food_pineapple_ring"}, - {"", "farming:juicer", ""}, - {"", "vessels:drinking_glass", ""} + {"", "vessels:drinking_glass", ""}, + {"", tmp, ""} }, replacements = { {"group:food_juicer", "farming:juicer"} @@ -67,8 +69,8 @@ minetest.register_craft({ output = "farming:pineapple_juice 2", recipe = { {"group:food_pineapple", ""}, - {"farming:juicer", ""}, - {"vessels:drinking_glass", "vessels:drinking_glass"} + {"vessels:drinking_glass", "vessels:drinking_glass"}, + {tmp, ""} }, replacements = { {"group:food_juicer", "farming:juicer"} diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index b32b17f..030bf16 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -20,9 +20,11 @@ minetest.register_craft({ } }) +local tmp = farming.use_utensils and "farming:cutting_board" or "" + minetest.register_craft({ output = "farming:pumpkin_slice 4", - recipe = {{"farming:cutting_board", "farming:pumpkin"}}, + recipe = {{"farming:pumpkin", tmp}}, replacements = {{"farming:cutting_board", "farming:cutting_board"}} }) diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index 989b72b..af251a9 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -19,10 +19,12 @@ minetest.register_craftitem("farming:rhubarb_pie", { on_use = minetest.item_eat(6) }) +local tmp = farming.use_utensils and "farming:baking_tray" or "" + minetest.register_craft({ output = "farming:rhubarb_pie", recipe = { - {"farming:baking_tray", "group:food_sugar", ""}, + {tmp, "group:food_sugar", ""}, {"group:food_rhubarb", "group:food_rhubarb", "group:food_rhubarb"}, {"group:food_wheat", "group:food_wheat", "group:food_wheat"} }, diff --git a/crops/rice.lua b/crops/rice.lua index 892278d..986f956 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -49,11 +49,13 @@ minetest.register_craftitem("farming:rice_flour", { groups = {food_rice_flour = 1, flammable = 1} }) +local tmp = farming.use_utensils and "farming:mortar_pestle" or "" + minetest.register_craft({ output = "farming:rice_flour", recipe = { {"farming:rice", "farming:rice", "farming:rice"}, - {"farming:rice", "farming:mortar_pestle", ""} + {"farming:rice", tmp, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua index ad2d5bc..2dd47c7 100644 --- a/crops/ryeoatrice.lua +++ b/crops/ryeoatrice.lua @@ -22,11 +22,13 @@ minetest.override_item("farming:rye_1", {drop = {}}) minetest.override_item("farming:rye_2", {drop = {}}) minetest.override_item("farming:rye_3", {drop = {}}) +local tmp = farming.use_utensils and "farming:mortar_pestle" or "" + minetest.register_craft({ output = "farming:flour", recipe = { {"farming:rye", "farming:rye", "farming:rye"}, - {"farming:rye", "farming:mortar_pestle", ""} + {"farming:rye", tmp, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -54,7 +56,7 @@ minetest.register_craft({ output = "farming:flour", recipe = { {"farming:oat", "farming:oat", "farming:oat"}, - {"farming:oat", "farming:mortar_pestle", ""} + {"farming:oat", tmp, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -72,7 +74,7 @@ minetest.register_craft({ output = "farming:flour_multigrain", recipe = { "farming:wheat", "farming:barley", "farming:oat", - "farming:rye", "farming:mortar_pestle" + "farming:rye", tmp }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/soy.lua b/crops/soy.lua index 13c20af..5b6b431 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -33,13 +33,14 @@ minetest.register_node("farming:soy_sauce", { sounds = default.node_sound_glass_defaults() }) +local tmp = farming.use_utensils and "farming:juicer" or "" + -- soy sauce recipe minetest.register_craft( { output = "farming:soy_sauce", recipe = { {"group:food_soy", "group:food_salt", "group:food_soy"}, - {"", "group:food_juicer", ""}, - {"", "bucket:bucket_water", "vessels:glass_bottle"} + {tmp, "bucket:bucket_water", "vessels:glass_bottle"} }, replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, @@ -88,11 +89,13 @@ minetest.register_craftitem("farming:tofu", { on_use = minetest.item_eat(3) }) +tmp = farming.use_utensils and "farming:baking_tray" or "" + minetest.register_craft({ output = "farming:tofu", 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"}} }) diff --git a/crops/wheat.lua b/crops/wheat.lua index d59e7e0..bab1c44 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -78,11 +78,13 @@ minetest.register_craftitem("farming:flour", { groups = {food_flour = 1, flammable = 1} }) +local tmp = farming.use_utensils and "farming:mortar_pestle" or "" + minetest.register_craft({ output = "farming:flour", recipe = { {"farming:wheat", "farming:wheat", "farming:wheat"}, - {"farming:wheat", "farming:mortar_pestle", ""} + {"farming:wheat", tmp, ""} }, 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} }) +tmp = farming.use_utensils and "farming:cutting_board" or "" + minetest.register_craft({ output = "farming:bread_slice 5", - recipe = {{"group:food_cutting_board", "farming:bread"}}, + recipe = {{"farming:bread", tmp}}, replacements = {{"group:food_cutting_board", "farming:cutting_board"}} }) diff --git a/food.lua b/food.lua index ca1ed16..9738577 100644 --- a/food.lua +++ b/food.lua @@ -1,7 +1,8 @@ local S = farming.intllib +local tmp ---= filter sea water into river water +-- filter sea water into river water minetest.register_craft({ output = "bucket:bucket_river_water", @@ -12,7 +13,7 @@ minetest.register_craft({ } }) ---= glass of water +-- glass of water minetest.register_craftitem("farming:glass_water", { description = S("Glass of Water"), @@ -53,7 +54,7 @@ if minetest.get_modpath("bucket_wooden") then }) end ---= Sugar +-- Sugar minetest.register_craftitem("farming:sugar", { description = S("Sugar"), @@ -90,7 +91,7 @@ minetest.register_craft({ recipe = {{"farming:sugar_cube"}} }) ---= Sugar caramel +-- Sugar caramel minetest.register_craftitem("farming:caramel", { description = S("Caramel"), @@ -104,7 +105,7 @@ minetest.register_craft({ recipe = "group:food_sugar" }) ---= Salt +-- Salt minetest.register_node("farming:salt", { description = S("Salt"), @@ -172,7 +173,7 @@ minetest.register_craft({ replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} }) ---= Salt Crystal +-- Salt Crystal minetest.register_node("farming: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({ output = "farming:salt 9", recipe = { - {"farming:salt_crystal", "farming:mortar_pestle"} + {"farming:salt_crystal", tmp} }, 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", { 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({ output = "farming:rose_water", recipe = { {"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 = { {"group:food_water_glass", "vessels:drinking_glass"}, @@ -240,7 +274,7 @@ minetest.register_craft({ } }) ---= Turkish Delight +-- Turkish Delight minetest.register_craftitem("farming:turkish_delight", { description = S("Turkish Delight"), @@ -263,7 +297,7 @@ minetest.register_craft({ } }) ---= Garlic Bread +-- Garlic Bread minetest.register_craftitem("farming: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", { description = S("Donut"), @@ -324,7 +358,7 @@ minetest.register_craft({ } }) ---= Porridge Oats +-- Porridge Oats minetest.register_craftitem("farming:porridge", { description = S("Porridge"), @@ -344,7 +378,7 @@ minetest.register_craft({ } }) ---= Jaffa Cake +-- Jaffa Cake minetest.register_craftitem("farming:jaffa_cake", { description = S("Jaffa Cake"), @@ -352,10 +386,12 @@ minetest.register_craftitem("farming:jaffa_cake", { on_use = minetest.item_eat(6) }) +tmp = farming.use_utensils and "farming:baking_tray" or "" + minetest.register_craft({ output = "farming:jaffa_cake 3", 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_milk", "", ""} }, @@ -375,11 +411,13 @@ minetest.register_craftitem("farming:apple_pie", { on_use = minetest.item_eat(6) }) +tmp = farming.use_utensils and "farming:baking_tray" or "" + minetest.register_craft({ output = "farming:apple_pie", recipe = { {"group:food_flour", "group:food_sugar", "group:food_apple"}, - {"", "group:food_baking_tray", ""} + {"", tmp, ""} }, replacements = {{"group:food_baking_tray", "farming:baking_tray"}} }) @@ -399,11 +437,13 @@ minetest.register_craftitem("farming:cactus_juice", { end }) +tmp = farming.use_utensils and "farming:juicer" or "" + minetest.register_craft({ output = "farming:cactus_juice", recipe = { + {tmp}, {"default:cactus"}, - {"farming:juicer"}, {"vessels:drinking_glass"} }, replacements = { @@ -419,10 +459,12 @@ minetest.register_craftitem("farming:pasta", { groups = {food_pasta = 1} }) +tmp = farming.use_utensils and "farming:mixing_bowl" or "" + minetest.register_craft({ output = "farming:pasta", 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"}} }) @@ -461,10 +503,12 @@ minetest.register_craftitem("farming:spaghetti", { on_use = minetest.item_eat(8) }) +tmp = farming.use_utensils and "farming:saucepan" or "" + minetest.register_craft({ output = "farming:spaghetti", 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", ""} }, replacements = {{"group:food_saucepan", "farming:saucepan"}} @@ -478,10 +522,12 @@ minetest.register_craftitem("farming:bibimbap", { on_use = minetest.item_eat(8, "farming:bowl") }) +tmp = farming.use_utensils and "farming:skillet" or "" + minetest.register_craft({ output = "farming:bibimbap", 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_carrot", "group:food_chili_pepper", ""} }, @@ -492,7 +538,7 @@ minetest.register_craft({ output = "farming:bibimbap", type = "shapeless", 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_mushroom", "group:food_chili_pepper" }, @@ -560,13 +606,15 @@ minetest.register_craftitem("farming:spanish_potatoes", { on_use = minetest.item_eat(8, "farming:bowl"), }) +tmp = farming.use_utensils and "farming:skillet" or "" + minetest.register_craft({ type = "shapeless", output = "farming:spanish_potatoes", recipe = { "farming:potato", "group:food_parsley", "farming:potato", "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"}} }) @@ -579,12 +627,14 @@ minetest.register_craftitem("farming:potato_omelet", { on_use = minetest.item_eat(6, "farming:bowl") }) +tmp = farming.use_utensils and "farming:skillet" or "" + minetest.register_craft({ - type = "shapeless", output = "farming:potato_omelet", recipe = { - "group:food_egg", "farming:potato", "group:food_onion", - "group:food_skillet", "group:food_bowl"}, + {"group:food_egg", "farming:potato", "group:food_onion"}, + {tmp, "group:food_bowl", ""} + }, replacements = {{"group:food_skillet", "farming:skillet"}} }) @@ -596,12 +646,14 @@ minetest.register_craftitem("farming:paella", { on_use = minetest.item_eat(8, "farming:bowl") }) +tmp = farming.use_utensils and "farming:skillet" or "" + minetest.register_craft({ - type = "shapeless", output = "farming:paella", recipe = { - "group:food_rice", "dye:orange", "farming:pepper_red", - "group:food_peas", "group:food_chicken", "group:food_bowl", "group:food_skillet" + {"group:food_rice", "dye:orange", "farming:pepper_red"}, + {"group:food_peas", "group:food_chicken", "group:food_bowl"}, + {"", tmp, ""} }, replacements = {{"group:food_skillet", "farming:skillet"}} }) @@ -637,13 +689,14 @@ minetest.register_craftitem("farming:cheese_vegan", { groups = {food_cheese = 1, flammable = 2} }) +tmp = farming.use_utensils and "farming:pot" or "" minetest.register_craft({ output = "farming:cheese_vegan", recipe = { {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, {"group:food_salt", "group:food_peppercorn", "farming:bottle_ethanol"}, - {"group:food_gelatin", "group:food_pot", ""} + {"group:food_gelatin", tmp, ""} }, replacements = { {"farming:soy_milk", "vessels:drinking_glass 3"}, @@ -657,7 +710,7 @@ minetest.register_craft({ recipe = { {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, {"group:food_salt", "group:food_peppercorn", "group:food_lemon"}, - {"group:food_gelatin", "group:food_pot", ""} + {"group:food_gelatin", tmp, ""} }, replacements = { {"farming:soy_milk", "vessels:drinking_glass 3"}, @@ -691,12 +744,14 @@ minetest.register_craftitem("farming:gyoza", { groups = {flammable = 2} }) +tmp = farming.use_utensils and "farming:skillet" or "" + minetest.register_craft({ output = "farming:gyoza 4", recipe = { {"group:food_cabbage", "group:food_garlic_clove", "group:food_onion"}, {"group:food_meat_raw", "group:food_salt", "group:food_flour"}, - {"", "group:food_skillet", ""} + {"", tmp, ""} }, replacements = { @@ -713,11 +768,13 @@ minetest.register_craftitem("farming:mochi", { groups = {flammable = 2} }) +tmp = farming.use_utensils and "farming:mortar_pestle" or "" + minetest.register_craft({ output = "farming:mochi", recipe = { + {"", tmp, ""}, {"group:food_rice", "group:food_sugar", "group:food_rice"}, - {"", "group:food_mortar_pestle", ""}, {"", "farming:glass_water", ""} }, replacements = { diff --git a/init.lua b/init.lua index 653a4b2..0ed1b55 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230407", + version = "20230713", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -20,7 +20,8 @@ farming = { registered_plants = {}, min_light = 12, 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 } diff --git a/license.txt b/license.txt index a44cef2..b593297 100644 --- a/license.txt +++ b/license.txt @@ -174,6 +174,7 @@ Created by Felfa (CC0) farming_spanish_potatoes.png farming_vanilla_flan.png farming_sunflower*.png + farming_mayo.png Created by gorlock (CC0) farming_salt_crystal.png diff --git a/settingtypes.txt b/settingtypes.txt index 05f50af..7573de9 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -1,2 +1,4 @@ # Contains a value used for speed of crop growth in seconds farming_stage_length (Farming Stage Length) float 160.0 + +farming_use_utensils (Use utensil recipes) bool true diff --git a/textures/farming_mayo.png b/textures/farming_mayo.png new file mode 100644 index 0000000..c8e773b Binary files /dev/null and b/textures/farming_mayo.png differ