From 9dbc0b2ba1e1b05d17773bd739632342a41f76a6 Mon Sep 17 00:00:00 2001 From: N-Nachtigal Date: Tue, 13 May 2025 19:24:36 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Nahrungspunkte=20f=C3=BCr=20Pizza-Mod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/jelys_pizzaria/functions.lua | 4 ++-- mods/jelys_pizzaria/items.lua | 3 ++- mods/jelys_pizzaria/mutation_backup.lua | 2 +- mods/jelys_pizzaria/nodes.lua | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mods/jelys_pizzaria/functions.lua b/mods/jelys_pizzaria/functions.lua index abfb081b..65587929 100644 --- a/mods/jelys_pizzaria/functions.lua +++ b/mods/jelys_pizzaria/functions.lua @@ -120,7 +120,7 @@ function jpizza.make_pizzas() description = "Slice of "..base.name.." Pizza", inventory_image = "jelys_pizzaria_pizza_slice.png^"..base.topping_inv[2], stack_max = 6, - groups = {food = 1}, + groups = {food = 1, eatable = (1+base.eat)}, on_use = minetest.item_eat(1+base.eat) }) if jpizza.has_depends.hunger_ng then @@ -182,7 +182,7 @@ function jpizza.make_pizzas() description = "Slice of "..base.name.." and "..side.name.." Pizza", inventory_image = "jelys_pizzaria_pizza_slice.png^"..base.topping_inv[num1].."^"..side.topping_inv[num2], stack_max = 6, - groups = {food = 1}, + groups = {food = 1, eatable = (1+base.eat+side.eat)}, on_use = minetest.item_eat(1+base.eat+side.eat) }) minetest.register_alias(pizza_name.."_slice", "jelys_pizzaria:pizza_"..side.name.."_"..base.name) diff --git a/mods/jelys_pizzaria/items.lua b/mods/jelys_pizzaria/items.lua index 669b7645..5fbe23c7 100644 --- a/mods/jelys_pizzaria/items.lua +++ b/mods/jelys_pizzaria/items.lua @@ -25,6 +25,7 @@ minetest.register_craftitem("jelys_pizzaria:burnt_pizza_slice", { description = "Burned Pizza Slice", inventory_image = "jelys_pizzaria_burnt_pizza_slice.png", stack_max = 12, + groups = {eatable = -2}, on_use = function(itemstack, player, pointed_thing) minetest.chat_send_player(player:get_player_name(), "Blecht") return minetest.do_item_eat(-2, "", itemstack, player, pointed_thing) @@ -129,7 +130,7 @@ minetest.register_craft({ minetest.register_craftitem("jelys_pizzaria:hainac_slice", { description = "Slice of \"Heart attack in a circle\" pizza", inventory_image = "jelys_pizzaria_hainac_slice.png", - groups = {food = 1}, + groups = {food = 1, eatable = 20}, on_use = function(itemstack, player, pointed_thing) minetest.after(1, function(itemstack, player, pointed_thing) if player:get_hp() > 0 then diff --git a/mods/jelys_pizzaria/mutation_backup.lua b/mods/jelys_pizzaria/mutation_backup.lua index 6f21fd7d..b199b056 100644 --- a/mods/jelys_pizzaria/mutation_backup.lua +++ b/mods/jelys_pizzaria/mutation_backup.lua @@ -137,7 +137,7 @@ if not jpizza.has_depends.pineapple and (not farming or farming and not farming. type = "fixed", fixed = {-3 / 16, -7 / 16, -3 / 16, 3 / 16, 4 / 16, 3 / 16} }, - groups = {fleshy = 3, dig_immediate = 3, flammable = 2}, + groups = {fleshy = 3, dig_immediate = 3, flammable = 2, eatable = 2}, on_use = minetest.item_eat(2), sounds = default.node_sound_leaves_defaults(), }) diff --git a/mods/jelys_pizzaria/nodes.lua b/mods/jelys_pizzaria/nodes.lua index ad9370e8..953bb4b0 100644 --- a/mods/jelys_pizzaria/nodes.lua +++ b/mods/jelys_pizzaria/nodes.lua @@ -137,7 +137,7 @@ minetest.register_craftitem("jelys_pizzaria:cheese_pizza_slice", { description = "Slice of Cheese Pizza", stack_max = 6, inventory_image = "jelys_pizzaria_pizza_slice.png", - groups = {food = 1}, + groups = {food = 1, eatable = 1}, on_use = minetest.item_eat(1), }) From df69eb154cf300418e251b0e976381d528e76d69 Mon Sep 17 00:00:00 2001 From: N-Nachtigal Date: Tue, 13 May 2025 22:33:52 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Rezepte=20angepasst,=20Nahrungspunkte=20hin?= =?UTF-8?q?zugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/animalia/init.lua | 2 +- mods/animalia/settingtypes.txt | 2 +- mods/farming/item_food.lua | 2 +- mods/naturalbiomes/bushland.lua | 8 +++---- mods/naturalbiomes/mediterranean.lua | 2 +- mods/naturalbiomes/palmbeach.lua | 8 +++---- mods/sandwiches/crops/peanuts.lua | 6 ++--- mods/sandwiches/init.lua | 36 ++++++++++++++-------------- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/mods/animalia/init.lua b/mods/animalia/init.lua index 339aba3e..3dc55d15 100644 --- a/mods/animalia/init.lua +++ b/mods/animalia/init.lua @@ -189,7 +189,7 @@ minetest.register_on_mods_loaded(function() end end) -local convert_mobs_redo = minetest.settings:get_bool("convert_redo_items", false) +local convert_mobs_redo = minetest.settings:get_bool("convert_redo_items", true) if convert_mobs_redo then minetest.register_alias_force("mobs:leather", "animalia:leather") diff --git a/mods/animalia/settingtypes.txt b/mods/animalia/settingtypes.txt index 6ef8f2b6..ed22e073 100644 --- a/mods/animalia/settingtypes.txt +++ b/mods/animalia/settingtypes.txt @@ -8,7 +8,7 @@ chunk_spawn_queue_int (Chunk Spawning Queue Execution Interval) float 16 spawn_mobs (Spawn Mobs) bool true # If true, items from mobs_redo and mobs_animal will be converted to Animalia items -convert_redo_items(Convert Mobs Redo Items) bool false +convert_redo_items(Convert Mobs Redo Items) bool true # If true, Guano will accumulate under resting bats guano_accumulation (Guano Accumulation) bool true diff --git a/mods/farming/item_food.lua b/mods/farming/item_food.lua index 2a735275..38fe9395 100644 --- a/mods/farming/item_food.lua +++ b/mods/farming/item_food.lua @@ -877,7 +877,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, food_milk = 1 + attached_node = 1, drink = 1, compostability = 65 }, is_ground_content = false, sounds = farming.node_sound_glass_defaults() diff --git a/mods/naturalbiomes/bushland.lua b/mods/naturalbiomes/bushland.lua index 3a5444ec..99601b3f 100644 --- a/mods/naturalbiomes/bushland.lua +++ b/mods/naturalbiomes/bushland.lua @@ -675,7 +675,7 @@ minetest.register_node("naturalbiomes:blackberry", { }, groups = { fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 1, leafdecay_drop = 1, food_blackberry = 1 + leafdecay = 1, leafdecay_drop = 1, food_blackberry = 1, food_blackberries = 1, eatable = 2 }, drop = "naturalbiomes:blackberry", on_use = minetest.item_eat(2), @@ -807,7 +807,7 @@ minetest.register_node("naturalbiomes:wildrose", { }, groups = { fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 1, leafdecay_drop = 1 + leafdecay = 1, leafdecay_drop = 1, eatable = 2 }, drop = "naturalbiomes:wildrose", on_use = minetest.item_eat(2), @@ -938,7 +938,7 @@ minetest.register_node("naturalbiomes:hazelnut", { }, groups = { fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 1, leafdecay_drop = 1 + leafdecay = 1, leafdecay_drop = 1, eatable = 2 }, drop = "naturalbiomes:hazelnut", on_use = minetest.item_eat(2), @@ -975,7 +975,7 @@ minetest.register_craftitem("naturalbiomes:hazelnut_cracked", { description = S("Cracked Hazelnut"), inventory_image = "naturalbiomes_bushland_hazelnut_cracked.png", on_use = minetest.item_eat(5), - groups = {food = 1, flammable = 2}, + groups = {food = 1, flammable = 2, eatable = 5}, }) xpanes.register_pane("hazelnut_pane", { diff --git a/mods/naturalbiomes/mediterranean.lua b/mods/naturalbiomes/mediterranean.lua index 8d1aa7f0..69e63711 100644 --- a/mods/naturalbiomes/mediterranean.lua +++ b/mods/naturalbiomes/mediterranean.lua @@ -807,7 +807,7 @@ minetest.register_node("naturalbiomes:olives", { }, groups = { fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 1, leafdecay_drop = 1, winleafdecay_drop = 1, winleafdecay = 3 + leafdecay = 1, leafdecay_drop = 1, winleafdecay_drop = 1, winleafdecay = 3, eatable = 6 }, drop = "naturalbiomes:olives", on_use = minetest.item_eat(6), diff --git a/mods/naturalbiomes/palmbeach.lua b/mods/naturalbiomes/palmbeach.lua index 80a1641d..8541a811 100644 --- a/mods/naturalbiomes/palmbeach.lua +++ b/mods/naturalbiomes/palmbeach.lua @@ -550,7 +550,7 @@ minetest.register_node("naturalbiomes:banana_bunch", { }, groups = { fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 1, leafdecay_drop = 1, winleafdecay_drop = 1, winleafdecay = 3 + leafdecay = 1, leafdecay_drop = 1, winleafdecay_drop = 1, winleafdecay = 3, eatable = 6 }, drop = "naturalbiomes:banana_bunch", on_use = minetest.item_eat(6), @@ -590,7 +590,7 @@ minetest.register_node("naturalbiomes:banana", { }, groups = { food_banana = 1, fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 1, leafdecay_drop = 1 + leafdecay = 1, leafdecay_drop = 1, eatable = 2 }, drop = "naturalbiomes:banana", on_use = minetest.item_eat(2), @@ -617,7 +617,7 @@ minetest.register_node("naturalbiomes:coconut_slice", { }, groups = { food_banana = 1, fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 1, leafdecay_drop = 1 + leafdecay = 1, leafdecay_drop = 1, eatable = 2 }, drop = "naturalbiomes:naturalbiomes:coconut_slice", on_use = minetest.item_eat(2), @@ -645,7 +645,7 @@ minetest.register_node("naturalbiomes:coconut", { }, groups = { fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 1, leafdecay_drop = 1, winleafdecay_drop = 1, winleafdecay = 3 + leafdecay = 1, leafdecay_drop = 1, winleafdecay_drop = 1, winleafdecay = 3, eatable = 6 }, drop = "naturalbiomes:coconut", on_use = minetest.item_eat(6), diff --git a/mods/sandwiches/crops/peanuts.lua b/mods/sandwiches/crops/peanuts.lua index b9d33481..d00747f7 100644 --- a/mods/sandwiches/crops/peanuts.lua +++ b/mods/sandwiches/crops/peanuts.lua @@ -30,7 +30,7 @@ if minetest.global_exists("farming") and farming.mod == "redo" then description = "Peanuts", on_use = minetest.item_eat(1), inventory_image = "sandwiches_peanut.png", -- not peanutS due to compatibility with the default farming mod - groups = {food = 1, food_peanut = 1, food_peanuts = 1, flammable = 1}, + groups = {food = 1, food_peanut = 1, food_peanuts = 1, flammable = 1, eatable = 1}, }) minetest.register_alias("sandwiches:seed_peanuts", "sandwiches:seed_peanut") @@ -138,7 +138,7 @@ else -- farming-redo not present ----------------------------------------------- --description = "Peanuts", on_use = minetest.item_eat(1), inventory_image = "sandwiches_peanut.png", - groups = {food = 1, food_peanut = 1, food_peanuts = 1, flammable = 1}, + groups = {food = 1, food_peanut = 1, food_peanuts = 1, flammable = 1, eatable = 1}, }) end @@ -219,7 +219,7 @@ minetest.register_decoration({ minetest.register_craftitem("sandwiches:peanut_butter", { description = "Peanut Butter", on_use = minetest.item_eat(2), - groups = {food = 2, food_peanut_butter = 1, flammable = 1, food_butter = 1}, + groups = {food = 2, food_peanut_butter = 1, flammable = 1, food_butter = 1, eatable = 2}, inventory_image = "sandwiches_peanut_butter.png" }) diff --git a/mods/sandwiches/init.lua b/mods/sandwiches/init.lua index ac9f2b51..abc2832f 100644 --- a/mods/sandwiches/init.lua +++ b/mods/sandwiches/init.lua @@ -44,7 +44,7 @@ end minetest.register_craftitem("sandwiches:bread_slice", { description = "Bread slice", on_use = minetest.item_eat(1), - groups = {food = 1, food_bread_slice = 1, flammable = 1}, + groups = {food = 1, food_bread_slice = 1, flammable = 1, eatable = 1}, inventory_image = "sandwiches_bread_slice.png" }) @@ -58,7 +58,7 @@ minetest.register_craft({ minetest.register_craftitem("sandwiches:bread_crumbs", { description = "Bread crumbs", on_use = minetest.item_eat(1), - groups = {food = 1, food_bread_crumbs = 1, flammable = 1}, + groups = {food = 1, food_bread_crumbs = 1, flammable = 1, eatable = 1}, inventory_image = "bread_crumbs.png" }) minetest.register_craft({ @@ -127,7 +127,7 @@ if minetest.get_modpath("bushes_classic") or sandwiches.ingredient_support.berry minetest.register_craftitem("sandwiches:sweet_bread_pudding", { description = "Sweet bread pudding", on_use = minetest.item_eat(10), - groups = {food = 10, food_sweet_bread = 1, flammable = 1}, + groups = {food = 10, food_sweet_bread = 1, flammable = 1, eatable = 10}, inventory_image = "sweet_bread_pudding.png" }) minetest.register_craft({ @@ -147,10 +147,10 @@ if minetest.get_modpath("bushes_classic") or sandwiches.ingredient_support.berry -- JAM AND JELLY -- local jj = { - ["blue"] = { {food_jam = 1, food_blueberry_jam = 1, flammable = 1},}, - ["rasp"] = { {food_jam = 1, food_raspberry_jam = 1, flammable = 1},}, - ["straw"] = { {food_jam = 1, food_strawberry_jam = 1, flammable = 1},}, - ["black"] = { {food_jam = 1, food_blackberry_jam = 1, flammable = 1},}, + ["blue"] = { {food_jam = 1, food_blueberry_jam = 1, flammable = 1, eatable = 2},}, + ["rasp"] = { {food_jam = 1, food_raspberry_jam = 1, flammable = 1, eatable = 2},}, + ["straw"] = { {food_jam = 1, food_strawberry_jam = 1, flammable = 1, eatable = 2},}, + ["black"] = { {food_jam = 1, food_blackberry_jam = 1, flammable = 1, eatable = 2},}, } for k, v in pairs(jj) do minetest.register_craftitem("sandwiches:".. k .."berry_jam", { @@ -174,7 +174,7 @@ if minetest.get_modpath("bushes_classic") or sandwiches.ingredient_support.berry minetest.register_craftitem("sandwiches:grape_jelly", { description = "Grape jelly", on_use = minetest.item_eat(2), - groups = {food = 2, food_jam = 1, flammable = 1 }, + groups = {food = 2, food_jam = 1, flammable = 1 , eatable = 2}, inventory_image = "sandwiches_grape_jelly.png" }) minetest.register_craft({ @@ -190,7 +190,7 @@ if minetest.get_modpath("bushes_classic") or sandwiches.ingredient_support.berry minetest.register_craftitem("sandwiches:multi_jam", { description = "Multi jam", on_use = minetest.item_eat(2), - groups = {food = 2, food_jam = 1, flammable = 1}, + groups = {food = 2, food_jam = 1, flammable = 1, eatable = 2}, inventory_image = "sandwiches_multi_jam.png" }) minetest.register_craft({ @@ -252,7 +252,7 @@ end minetest.register_craftitem("sandwiches:butter_carrots", { description = "Butter carrots", on_use = minetest.item_eat(3), - groups = {food = 3, food_tasty_veggie = 1, flammable = 1}, + groups = {food = 3, food_tasty_veggie = 1, flammable = 1, eatable = 3}, inventory_image = "butter_carrots.png" }) minetest.register_craft({ @@ -268,7 +268,7 @@ end minetest.register_craftitem("sandwiches:roasted_potatoes", { description = "Roasted potatoes", on_use = minetest.item_eat(4), - groups = {food = 4, food_tasty_veggie = 1, flammable = 1}, + groups = {food = 4, food_tasty_veggie = 1, flammable = 1, eatable = 4}, inventory_image = "roasted_potatoes.png" }) minetest.register_craft({ @@ -287,7 +287,7 @@ end minetest.register_craftitem("sandwiches:caramelized_onion", { description = "Caramelized onion", on_use = minetest.item_eat(3), - groups = {food = 3, food_tasty_veggie = 1, flammable = 1}, + groups = {food = 3, food_tasty_veggie = 1, flammable = 1, eatable = 3}, inventory_image = "caramelized_onion.png" }) minetest.register_craft({ @@ -301,7 +301,7 @@ if sandwiches.ingredient_support.mushroom then minetest.register_craftitem("sandwiches:trifolat_mushrooms", { description = "Trifolat Mushrooms", on_use = minetest.item_eat(3), - groups = {food = 3, food_tasty_veggie = 1, flammable = 1}, + groups = {food = 3, food_tasty_veggie = 1, flammable = 1, eatable = 3}, inventory_image = "trifolat_mushrooms.png" }) minetest.register_craft({ @@ -441,7 +441,7 @@ for k, v in pairs(sandwiches_recipes) do minetest.register_craftitem("sandwiches:".. k .."_sandwich", { description = v[2].." sandwich", on_use = minetest.item_eat(v[3], "sandwiches:bread_crumbs"), - groups = {food = v[3] ,food_sandwich = 1, flammable = 1}, + groups = {food = v[3] ,food_sandwich = 1, flammable = 1, eatable = v[3]}, inventory_image = k .."_sandwich.png", }) @@ -485,7 +485,7 @@ minetest.register_alias("sandwiches:classic_vegan_sandwich", "sandwiches:classic minetest.register_craftitem("sandwiches:triple_mega_sandwich", { description = "Triple Mega sandwich", on_use = minetest.item_eat(20, "sandwiches:bread_crumbs"), - groups = {food = 20, food_big_sandwich = 1, flammable = 1}, + groups = {food = 20, food_big_sandwich = 1, flammable = 1, eatable = 20}, inventory_image = "triple_mega_sandwich.png" }) minetest.register_craft({ @@ -500,7 +500,7 @@ minetest.register_craft({ minetest.register_craftitem("sandwiches:sand_sandwich", { description = "Sand-sandwich", inventory_image = "sand_sandwich.png", - groups = {food = 5, food_sandwich = 1, flammable = 1}, + groups = {food = 5, food_sandwich = 1, flammable = 1, eatable = 5}, on_use = function(itemstack, player, pointed_thing) if player:get_hp() > 2 then player:set_hp(player:get_hp() - 2) @@ -523,7 +523,7 @@ if sandwiches.ingredient_support.dairy then minetest.register_craftitem("sandwiches:sprinkles", { description = "Sprinkles", on_use = minetest.item_eat(1), - groups = {food = 1, food_sprinkles = 1, flammable = 1}, + groups = {food = 1, food_sprinkles = 1, flammable = 1, eatable = 1}, inventory_image = "sugar_sprinkles.png" }) minetest.register_craft({ @@ -539,7 +539,7 @@ minetest.register_craft({ minetest.register_craftitem("sandwiches:fairy_bread", { description = "Fairy bread", on_use = minetest.item_eat(6, "sandwiches:bread_crumbs"), - groups = {food = 6, food_fairy_bread = 1, flammable = 1}, + groups = {food = 6, food_fairy_bread = 1, flammable = 1, eatable = 6}, inventory_image = "fairy_bread.png" }) minetest.register_craft({