From 473e5504539d7cda16a46071b2a459db10e15165 Mon Sep 17 00:00:00 2001 From: N-Nachtigal Date: Sat, 10 May 2025 20:07:45 +0200 Subject: [PATCH] =?UTF-8?q?Rezepte=20angepasst.=20Gruppen=20hinzugef=C3=BC?= =?UTF-8?q?gt.=20Pumpkin=20slices=20bei=20x=5Ffarming=20hinzugef=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/farming/item_food.lua | 24 ++++++--- mods/farming/item_recipes.lua | 71 ++++++++++++++++++++------ mods/sandwiches/init.lua | 5 +- mods/sandwiches/luas/cucina_vegana.lua | 55 ++++---------------- mods/x_farming/barley.lua | 3 +- mods/x_farming/beetroot.lua | 3 +- mods/x_farming/kiwi_tree.lua | 1 + mods/x_farming/pumpkin.lua | 28 ++++++++++ 8 files changed, 116 insertions(+), 74 deletions(-) diff --git a/mods/farming/item_food.lua b/mods/farming/item_food.lua index 758064d6..41ce29e0 100644 --- a/mods/farming/item_food.lua +++ b/mods/farming/item_food.lua @@ -188,14 +188,18 @@ farming.add_eatable("farming:tomato_soup", 8) -- sliced bread -minetest.register_craftitem("farming:bread_slice", { - description = S("Sliced Bread"), - inventory_image = "farming_bread_slice.png", - on_use = minetest.item_eat(1), - groups = {food_bread_slice = 1, compostability = 65} -}) +if not minetest.get_modpath("sandwiches") then -farming.add_eatable("farming:bread_slice", 1) + minetest.register_craftitem("farming:bread_slice", { + description = S("Sliced Bread"), + inventory_image = "farming_bread_slice.png", + on_use = minetest.item_eat(1), + groups = {food_bread_slice = 1, compostability = 65} + }) + + farming.add_eatable("farming:bread_slice", 1) + +end -- toast @@ -385,6 +389,8 @@ farming.add_eatable("farming:turkish_delight", 2) -- Garlic Bread +if not(minetest.get_modpath("sandwiches")) then + minetest.register_craftitem("farming:garlic_bread", { description = S("Garlic Bread"), inventory_image = "farming_garlic_bread.png", @@ -394,6 +400,8 @@ minetest.register_craftitem("farming:garlic_bread", { farming.add_eatable("farming:garlic_bread", 2) +end + -- Donuts (thanks to Bockwurst for making the donut images) minetest.register_craftitem("farming:donut", { @@ -862,7 +870,7 @@ minetest.register_node("farming:soy_milk", { on_use = minetest.item_eat(2, "vessels:drinking_glass"), groups = { vessel = 1, food_milk_glass = 1, food_soy_milk = 1, dig_immediate = 3, handy = 1, - attached_node = 1, drink = 1, compostability = 65 + attached_node = 1, drink = 1, compostability = 65, food_milk = 1 }, is_ground_content = false, sounds = farming.node_sound_glass_defaults() diff --git a/mods/farming/item_recipes.lua b/mods/farming/item_recipes.lua index 50602db2..f07fe3a7 100644 --- a/mods/farming/item_recipes.lua +++ b/mods/farming/item_recipes.lua @@ -15,8 +15,8 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:flour", recipe = { - {"farming:barley", "farming:barley", "farming:barley"}, - {"farming:barley", a.mortar_pestle, ""} + {"group:food_barley", "group:food_barley", "group:food_barley"}, + {"group:food_barley", a.mortar_pestle, ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -53,11 +53,15 @@ minetest.register_craft({ -- sliced bread -minetest.register_craft({ - output = "farming:bread_slice 5", - recipe = {{"group:food_bread", a.cutting_board}}, - replacements = {{"group:food_cutting_board", "farming:cutting_board"}} -}) +if not minetest.get_modpath("sandwiches") then + + minetest.register_craft({ + output = "farming:bread_slice 5", + recipe = {{"group:food_bread", a.cutting_board}}, + replacements = {{"group:food_cutting_board", "farming:cutting_board"}} + }) + +end -- toast @@ -65,7 +69,7 @@ minetest.register_craft({ type = "cooking", cooktime = 3, output = "farming:toast", - recipe = "farming:bread_slice" + recipe = "group:food_bread_slice" }) -- toast sandwich @@ -73,9 +77,9 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:toast_sandwich", recipe = { - {"farming:bread_slice"}, + {"group:food_bread_slice"}, {"farming:toast"}, - {"farming:bread_slice"} + {"group:food_bread_slice"} } }) @@ -416,12 +420,29 @@ minetest.register_craft({ -- garlic bread -minetest.register_craft({ - output = "farming:garlic_bread", - recipe = { - {"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"} - } -}) +if not(minetest.get_modpath("sandwiches")) then + + minetest.register_craft({ + output = "farming:garlic_bread", + recipe = { + {"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"} + } + }) + +end + +if minetest.get_modpath("sandwiches") then + + minetest.register_craft({ + output = "sandwiches:garlic_bread", + recipe = { + {"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"} + } + }) + +end + + -- donuts @@ -896,6 +917,24 @@ minetest.register_craft({ replacements = {{"farming:cutting_board", "farming:cutting_board"}} }) +if minetest.get_modpath('x_farming') then + minetest.register_craft({ + output = "farming:pumpkin_slice 4", + recipe = {{"x_farming:pumpkin_fruit", a.cutting_board}}, + replacements = {{"farming:cutting_board", "farming:cutting_board"}} + }) + + minetest.register_craft({ + output = "x_farming:pumpkin_fruit", + recipe = { + {"farming:pumpkin_slice", "farming:pumpkin_slice"}, + {"farming:pumpkin_slice", "farming:pumpkin_slice"} + } + }) + + +end + -- pumpkin dough minetest.register_craft({ diff --git a/mods/sandwiches/init.lua b/mods/sandwiches/init.lua index c7f9bcd2..d322f41c 100644 --- a/mods/sandwiches/init.lua +++ b/mods/sandwiches/init.lua @@ -47,10 +47,11 @@ minetest.register_craftitem("sandwiches:bread_slice", { groups = {food = 1, food_bread_slice = 1, flammable = 1}, inventory_image = "sandwiches_bread_slice.png" }) + minetest.register_craft({ - output = "sandwiches:bread_slice 8", + output = "sandwiches:bread_slice 4", type = "shapeless", - recipe = {"group:food_bread", "group:food_cutting_board", "group:food_bread"}, + recipe = {"group:food_bread", "group:food_cutting_board", ""}, replacements = { {"group:food_cutting_board", board }, } }) diff --git a/mods/sandwiches/luas/cucina_vegana.lua b/mods/sandwiches/luas/cucina_vegana.lua index 68b4b5c2..cf1b59ca 100644 --- a/mods/sandwiches/luas/cucina_vegana.lua +++ b/mods/sandwiches/luas/cucina_vegana.lua @@ -67,15 +67,7 @@ minetest.register_craft({ output = "sandwiches:tasty_tofu_sandwich", recipe = { {"", "sandwiches:bread_slice", ""}, - {"cucina_vegana:asparagus", "cucina_vegana:tofu_cooked" ,"cucina_vegana:asparagus"}, - {"", "sandwiches:bread_slice", ""}, - } -}) -minetest.register_craft({ - output = "sandwiches:tasty_tofu_sandwich", - recipe = { - {"", "sandwiches:bread_slice", ""}, - {"cucina_vegana:asparagus", "farming:tofu_cooked" ,"cucina_vegana:asparagus"}, + {"cucina_vegana:asparagus", "group:food_tofu" ,"cucina_vegana:asparagus"}, {"", "sandwiches:bread_slice", ""}, } }) @@ -86,19 +78,12 @@ minetest.register_craftitem("sandwiches:tofu_sandwich", { groups = {food = 7, food_sandwich = 1, food_vegan = 1}, inventory_image = "tofu_sandwich.png" }) + minetest.register_craft({ output = "sandwiches:tofu_sandwich", recipe = { {"", "sandwiches:bread_slice", ""}, - {"cucina_vegana:chives","cucina_vegana:tofu_cooked", "cucina_vegana:rosemary"}, - {"", "sandwiches:bread_slice", ""}, - } -}) -minetest.register_craft({ - output = "sandwiches:tofu_sandwich", - recipe = { - {"", "sandwiches:bread_slice", ""}, - {"cucina_vegana:chives","farming:tofu_cooked", "cucina_vegana:rosemary"}, + {"cucina_vegana:chives","group:food_tofu", "cucina_vegana:rosemary"}, {"", "sandwiches:bread_slice", ""}, } }) @@ -128,19 +113,12 @@ minetest.register_craft({ {"", "sandwiches:bread_slice", ""}, } }) + minetest.register_craft({ output = "sandwiches:gourmet_sandwich", recipe = { {"", "sandwiches:bread_slice", ""}, - {"cucina_vegana:chives", "cucina_vegana:tofu_cooked" ,"cucina_vegana:sauce_hollandaise" }, - {"", "sandwiches:bread_slice", ""}, - } -}) -minetest.register_craft({ - output = "sandwiches:gourmet_sandwich", - recipe = { - {"", "sandwiches:bread_slice", ""}, - {"cucina_vegana:chives", "farming:tofu_cooked" ,"cucina_vegana:sauce_hollandaise" }, + {"cucina_vegana:chives", "group:food_tofu" ,"cucina_vegana:sauce_hollandaise" }, {"", "sandwiches:bread_slice", ""}, } }) @@ -167,7 +145,7 @@ minetest.register_craft({ output = "sandwiches:classic_sandwich", recipe = { {"", "sandwiches:bread_slice", ""}, - {"group:food_lettuce", "cucina_vegana:tofu_cooked", "group:food_tomato" }, + {"group:food_lettuce", "group:food_tofu", "group:food_tomato" }, {"", "sandwiches:bread_slice", ""}, } }) @@ -186,15 +164,7 @@ minetest.register_craft({ output = "sandwiches:fancy_garlic_sandwich", recipe = { {"", "sandwiches:garlic_bread", ""}, - {"cucina_vegana:tofu_cooked", "sandwiches:trifolat_mushrooms", "group:food_cheese"}, - {"", "sandwiches:garlic_bread", ""}, - }, -}) -minetest.register_craft({ - output = "sandwiches:fancy_garlic_sandwich", - recipe = { - {"", "sandwiches:garlic_bread", ""}, - {"farming:tofu_cooked", "sandwiches:trifolat_mushrooms", "group:food_cheese"}, + {"group:food_tofu", "sandwiches:trifolat_mushrooms", "group:food_cheese"}, {"", "sandwiches:garlic_bread", ""}, }, }) @@ -203,19 +173,12 @@ minetest.register_craft({ output = "sandwiches:tasty_garlic_sandwich", recipe = { {"", "sandwiches:garlic_bread", ""}, - {"group:food_tomato", "cucina_vegana:tofu_cooked", "group:food_cheese"}, - {"", "sandwiches:garlic_bread", ""}, - }, -}) -minetest.register_craft({ - output = "sandwiches:tasty_garlic_sandwich", - recipe = { - {"", "sandwiches:garlic_bread", ""}, - {"group:food_tomato", "farming:tofu_cooked", "group:food_cheese"}, + {"group:food_tomato", "group:food_tofu", "group:food_cheese"}, {"", "sandwiches:garlic_bread", ""}, }, }) + --ALREADY EXISTING NON SANDWICH ITEMS minetest.register_craft({ diff --git a/mods/x_farming/barley.lua b/mods/x_farming/barley.lua index e201a93f..a2f2140b 100644 --- a/mods/x_farming/barley.lua +++ b/mods/x_farming/barley.lua @@ -40,7 +40,8 @@ local override_def = { -- X Farming compost = 50, -- MCL - compostability = 50 + compostability = 50, + food_barley = 1 }, _mcl_blast_resistance = 0, } diff --git a/mods/x_farming/beetroot.lua b/mods/x_farming/beetroot.lua index 2803ef5c..deb0c866 100644 --- a/mods/x_farming/beetroot.lua +++ b/mods/x_farming/beetroot.lua @@ -45,7 +45,8 @@ local beetroot_def = { -- MCL food = 2, eatable = 1, - compostability = 65 + compostability = 65, + food_beetroot = 1 }, _mcl_saturation = 1.2, _mcl_blast_resistance = 0, diff --git a/mods/x_farming/kiwi_tree.lua b/mods/x_farming/kiwi_tree.lua index 2cc685a9..2290d1ef 100644 --- a/mods/x_farming/kiwi_tree.lua +++ b/mods/x_farming/kiwi_tree.lua @@ -281,6 +281,7 @@ local kiwi_fruit_def = { -- ALL flammable = 2, attached_node = 1, + food_kiwi = 1 }, _mcl_blast_resistance = 0, _mcl_hardness = 0, diff --git a/mods/x_farming/pumpkin.lua b/mods/x_farming/pumpkin.lua index 75ff83f9..08eb1b26 100644 --- a/mods/x_farming/pumpkin.lua +++ b/mods/x_farming/pumpkin.lua @@ -214,3 +214,31 @@ minetest.register_decoration(asuna.features.crops.pumpkin.inject_decoration({ "x_farming:pumpkin_fruit", }, })) + +--- Pumpkin slice with mod farming + +if minetest.get_modpath('farming') then + + minetest.register_craftitem("x_farming:pumpkin_slice", { + description = S("Pumpkin Slice"), + inventory_image = "farming_pumpkin_slice.png", + groups = {compostability = 48, food_pumpkin_slice = 1}, + on_use = minetest.item_eat(2), + }) + + minetest.register_craft({ + output = "x_farming:pumpkin_slice 4", + recipe = {{"x_farming:pumpkin_fruit", "farming:cutting_board"}}, + replacements = {{"farming:cutting_board", "farming:cutting_board"}} + }) + + minetest.register_craft({ + output = "x_farming:pumpkin_fruit", + recipe = { + {"x_farming:pumpkin_slice", "x_farming:pumpkin_slice"}, + {"x_farming:pumpkin_slice", "x_farming:pumpkin_slice"} + } + }) + +end +