diff --git a/mods/cucina_vegana/items.lua b/mods/cucina_vegana/items.lua index f68a8af3..9001247c 100644 --- a/mods/cucina_vegana/items.lua +++ b/mods/cucina_vegana/items.lua @@ -65,44 +65,52 @@ minetest.register_craftitem("cucina_vegana:pizza_dough", { groups = {food = 1, pizza_dough = 1}, }) -minetest.register_craftitem("cucina_vegana:rice_flour", { - description = S("Rice Flour"), - groups = {food_vegan = 1, food_flour = 1}, - inventory_image = "cucina_vegana_rice_flour.png", -}) +if not(minetest.get_modpath("x_farming")) then -minetest.register_craftitem("cucina_vegana:rice_starch", { - description = S("Rice Starch"), - groups = {food_vegan = 1, food_starch = 1}, - inventory_image = "cucina_vegana_rice_starch.png", -}) + minetest.register_craftitem("cucina_vegana:rice_flour", { + description = S("Rice Flour"), + groups = {food_vegan = 1, food_flour = 1}, + inventory_image = "cucina_vegana_rice_flour.png", + }) -minetest.register_craftitem("cucina_vegana:soy_milk", { - description = S("Soy Milk"), - inventory_image = "cucina_vegana_soy_milk.png", - groups = {flammable = 1, food = 1, food_milk = 1, eatable = 1, food_vegan = 1}, - on_use = minetest.item_eat(2, "vessels:drinking_glass"), -}) + minetest.register_craftitem("cucina_vegana:rice_starch", { + description = S("Rice Starch"), + groups = {food_vegan = 1, food_starch = 1}, + inventory_image = "cucina_vegana_rice_starch.png", + }) -minetest.register_craftitem("cucina_vegana:sunflower_seeds_dough", { - description = S("Sunflower Seeds Dough"), - groups = {food = 1, food_vegan = 1, eatable = 1, bread_dough = 1}, - inventory_image = "cucina_vegana_sunflower_seeds_dough.png", - on_use = minetest.item_eat(2), -}) + minetest.register_craftitem("cucina_vegana:soy_milk", { + description = S("Soy Milk"), + inventory_image = "cucina_vegana_soy_milk.png", + groups = {flammable = 1, food = 1, food_milk = 1, eatable = 1, food_vegan = 1, food_soy_milk = 1}, + on_use = minetest.item_eat(2, "vessels:drinking_glass"), + }) -minetest.register_craftitem("cucina_vegana:sunflower_seeds_flour", { - description = S("Sunflower Seeds Flour"), - groups = {food_vegan = 1, food_flour = 1}, - inventory_image = "cucina_vegana_sunflower_seeds_flour.png", -}) +end -minetest.register_craftitem("cucina_vegana:tofu", { - description = S("Tofu (raw)"), - inventory_image = "cucina_vegana_tofu.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1}, - on_use = minetest.item_eat(2), -}) +if not(minetest.get_modpath("farming")) then + + minetest.register_craftitem("cucina_vegana:sunflower_seeds_dough", { + description = S("Sunflower Seeds Dough"), + groups = {food = 1, food_vegan = 1, eatable = 1, bread_dough = 1}, + inventory_image = "cucina_vegana_sunflower_seeds_dough.png", + on_use = minetest.item_eat(2), + }) + + minetest.register_craftitem("cucina_vegana:sunflower_seeds_flour", { + description = S("Sunflower Seeds Flour"), + groups = {food_vegan = 1, food_flour = 1}, + inventory_image = "cucina_vegana_sunflower_seeds_flour.png", + }) + + minetest.register_craftitem("cucina_vegana:tofu", { + description = S("Tofu (raw)"), + inventory_image = "cucina_vegana_tofu.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_tofu_raw = 1}, + on_use = minetest.item_eat(2), + }) + +end -- ******************************************* -- ***** Imitations ***** @@ -153,12 +161,16 @@ minetest.register_craftitem("cucina_vegana:asparagus", { on_use = minetest.item_eat(3), }) -minetest.register_craftitem("cucina_vegana:banana", { - description = S("Banana"), - inventory_image = "cucina_vegana_banana.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_banana = 1}, - on_use = minetest.item_eat(4), -}) +if not(minetest.get_modpath("ethereal")) then + + minetest.register_craftitem("cucina_vegana:banana", { + description = S("Banana"), + inventory_image = "cucina_vegana_banana.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_banana = 1}, + on_use = minetest.item_eat(4), + }) + +end minetest.register_craftitem("cucina_vegana:chives", { description = S("Chives"), @@ -167,24 +179,29 @@ minetest.register_craftitem("cucina_vegana:chives", { on_use = minetest.item_eat(1), }) -minetest.register_craftitem("cucina_vegana:coffee_beans_raw", { - description = S("Coffee Beans raw"), - inventory_image = "cucina_vegana_coffee_beans_raw.png", - groups = {flammable = 1, food_coffee = 1}, -}) -minetest.register_craftitem("cucina_vegana:coffee_beans_roasted", { - description = S("Coffee Beans"), - inventory_image = "cucina_vegana_coffee_beans_roasted.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_coffee = 1}, - on_use = minetest.item_eat(.5), -}) +if not(minetest.get_modpath("x_farming")) then -minetest.register_craftitem("cucina_vegana:coffee_powder", { - description = S("Coffee Powder"), - inventory_image = "cucina_vegana_coffee_powder.png", - groups = {flammable = 1, food_coffee = 1}, -}) + minetest.register_craftitem("cucina_vegana:coffee_beans_raw", { + description = S("Coffee Beans raw"), + inventory_image = "cucina_vegana_coffee_beans_raw.png", + groups = {flammable = 1, food_coffee = 1}, + }) + + minetest.register_craftitem("cucina_vegana:coffee_beans_roasted", { + description = S("Coffee Beans"), + inventory_image = "cucina_vegana_coffee_beans_roasted.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_coffee = 1}, + on_use = minetest.item_eat(.5), + }) + + minetest.register_craftitem("cucina_vegana:coffee_powder", { + description = S("Coffee Powder"), + inventory_image = "cucina_vegana_coffee_powder.png", + groups = {flammable = 1, food_coffee = 1}, + }) + +end minetest.register_craftitem("cucina_vegana:flax", { description = S("Flax (raw)"), @@ -205,32 +222,44 @@ minetest.register_craftitem("cucina_vegana:kohlrabi", { on_use = minetest.item_eat(3), }) -minetest.register_craftitem("cucina_vegana:lettuce", { - description = S("Lettuce"), - inventory_image = "cucina_vegana_lettuce.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_lettuce = 1}, - on_use = minetest.item_eat(2), -}) +if not(minetest.get_modpath("farming")) then -minetest.register_craftitem("cucina_vegana:parsley", { - description = S("Parsley"), - inventory_image = "cucina_vegana_parsley.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_parsley = 1}, - on_use = minetest.item_eat(1), -}) + minetest.register_craftitem("cucina_vegana:lettuce", { + description = S("Lettuce"), + inventory_image = "cucina_vegana_lettuce.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_lettuce = 1}, + on_use = minetest.item_eat(2), + }) -minetest.register_craftitem("cucina_vegana:peanut", { - description = S("Peanut"), - inventory_image = "cucina_vegana_peanut.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_peanut = 1}, - on_use = minetest.item_eat(4), -}) + minetest.register_craftitem("cucina_vegana:parsley", { + description = S("Parsley"), + inventory_image = "cucina_vegana_parsley.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_parsley = 1}, + on_use = minetest.item_eat(1), + }) -minetest.register_craftitem("cucina_vegana:rice", { - description = S("Rice"), - inventory_image = "cucina_vegana_rice.png", - groups = {food = 1, flammable = 4, food_rice = 1}, -}) +end + +if not(minetest.get_modpath("sandwiches")) then + + minetest.register_craftitem("cucina_vegana:peanut", { + description = S("Peanut"), + inventory_image = "cucina_vegana_peanut.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_peanut = 1}, + on_use = minetest.item_eat(4), + }) + +end + +if not(minetest.get_modpath("x_farming")) then + + minetest.register_craftitem("cucina_vegana:rice", { + description = S("Rice"), + inventory_image = "cucina_vegana_rice.png", + groups = {food = 1, flammable = 4, food_rice = 1}, + }) + +end minetest.register_craftitem("cucina_vegana:rosemary", { description = S("Rosemary Twig"), @@ -239,86 +268,106 @@ minetest.register_craftitem("cucina_vegana:rosemary", { on_use = minetest.item_eat(1), }) -minetest.register_craftitem("cucina_vegana:soy", { - description = S("Soy Bean"), - inventory_image = "cucina_vegana_soy.png", - groups = {flammable = 4, food_soy = 1}, -}) +if not(minetest.get_modpath("x_farming")) then -minetest.register_craftitem("cucina_vegana:sunflower", { - description = S("Sunflower"), - inventory_image = "cucina_vegana_sunflower.png", - groups = {flammable = 4}, -}) + minetest.register_craftitem("cucina_vegana:soy", { + description = S("Soy Bean"), + inventory_image = "cucina_vegana_soy.png", + groups = {flammable = 4, food_soy = 1}, + }) -minetest.register_craftitem("cucina_vegana:sunflower_seeds", { - description = S("Sunflower Seeds"), - groups = {seed = 1, food = 1, eatable = 1, food_sunflower = 1}, - inventory_image = "cucina_vegana_sunflower_seeds.png", - on_use = minetest.item_eat(1), -}) +end -minetest.register_craftitem("cucina_vegana:tomato", { - description = S("Tomato"), - inventory_image = "cucina_vegana_tomato.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_tomato = 1}, - on_use = minetest.item_eat(4), -}) +if not(minetest.get_modpath("farming")) then -minetest.register_craftitem("cucina_vegana:potato", { - description = S("Potato"), - inventory_image = "cucina_vegana_potato.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_potato = 1}, - on_use = minetest.item_eat(5), -}) + minetest.register_craftitem("cucina_vegana:sunflower", { + description = S("Sunflower"), + inventory_image = "cucina_vegana_sunflower.png", + groups = {flammable = 4}, + }) -minetest.register_craftitem("cucina_vegana:carrot", { - description = S("Carrot"), - inventory_image = "cucina_vegana_carrot.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_carrot = 1}, - on_use = minetest.item_eat(3), -}) + minetest.register_craftitem("cucina_vegana:sunflower_seeds", { + description = S("Sunflower Seeds"), + groups = {seed = 1, food = 1, eatable = 1, food_sunflower = 1}, + inventory_image = "cucina_vegana_sunflower_seeds.png", + on_use = minetest.item_eat(1), + }) + + minetest.register_craftitem("cucina_vegana:tomato", { + description = S("Tomato"), + inventory_image = "cucina_vegana_tomato.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_tomato = 1}, + on_use = minetest.item_eat(4), + }) -minetest.register_craftitem("cucina_vegana:garlic", { - description = S("Garlic"), - inventory_image = "cucina_vegana_garlic.png", - groups = {flammable = 1, food = 1, food_vegan = 1, food_garlic = 1}, -}) +end -minetest.register_craftitem("cucina_vegana:chili", { - description = S("Chili"), - inventory_image = "cucina_vegana_chili.png", - groups = {flammable = 1, food = 1, food_vegan = 1, food_chili = 1}, - on_use = minetest.item_eat(1), -}) +if not(minetest.get_modpath("x_farming")) then + + minetest.register_craftitem("cucina_vegana:potato", { + description = S("Potato"), + inventory_image = "cucina_vegana_potato.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_potato = 1}, + on_use = minetest.item_eat(5), + }) -minetest.register_craftitem("cucina_vegana:onion", { - description = S("Onion"), - inventory_image = "cucina_vegana_onion.png", - groups = {flammable = 1, food = 1, food_vegan = 1, food_onion = 1}, - on_use = minetest.item_eat(3), -}) + minetest.register_craftitem("cucina_vegana:carrot", { + description = S("Carrot"), + inventory_image = "cucina_vegana_carrot.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_carrot = 1}, + on_use = minetest.item_eat(3), + }) -minetest.register_craftitem("cucina_vegana:cucumber", { - description = S("Cucumber"), - inventory_image = "cucina_vegana_cucumber.png", - groups = {flammable = 1, food = 1, food_vegan = 1, food_onion = 1}, - on_use = minetest.item_eat(3), -}) +end -minetest.register_craftitem("cucina_vegana:strawberry", { - description = S("Strawberry"), - inventory_image = "cucina_vegana_strawberry.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_strawberry = 1}, - on_use = minetest.item_eat(2), -}) +if not(minetest.get_modpath("farming")) then + + minetest.register_craftitem("cucina_vegana:garlic", { + description = S("Garlic"), + inventory_image = "cucina_vegana_garlic.png", + groups = {flammable = 1, food = 1, food_vegan = 1, food_garlic = 1}, + }) -minetest.register_craftitem("cucina_vegana:corn", { - description = S("Corncob"), - inventory_image = "cucina_vegana_corn.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_corn = 1}, - on_use = minetest.item_eat(2), -}) + minetest.register_craftitem("cucina_vegana:chili", { + description = S("Chili"), + inventory_image = "cucina_vegana_chili.png", + groups = {flammable = 1, food = 1, food_vegan = 1, food_chili = 1}, + on_use = minetest.item_eat(1), + }) + + minetest.register_craftitem("cucina_vegana:onion", { + description = S("Onion"), + inventory_image = "cucina_vegana_onion.png", + groups = {flammable = 1, food = 1, food_vegan = 1, food_onion = 1}, + on_use = minetest.item_eat(3), + }) + + minetest.register_craftitem("cucina_vegana:cucumber", { + description = S("Cucumber"), + inventory_image = "cucina_vegana_cucumber.png", + groups = {flammable = 1, food = 1, food_vegan = 1, food_onion = 1}, + on_use = minetest.item_eat(3), + }) + +end + +if not(minetest.get_modpath("x_farming")) then + + minetest.register_craftitem("cucina_vegana:strawberry", { + description = S("Strawberry"), + inventory_image = "cucina_vegana_strawberry.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_strawberry = 1}, + on_use = minetest.item_eat(2), + }) + + minetest.register_craftitem("cucina_vegana:corn", { + description = S("Corncob"), + inventory_image = "cucina_vegana_corn.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_corn = 1}, + on_use = minetest.item_eat(2), + }) + +end -- ******************************************* -- ***** Food ***** @@ -331,26 +380,30 @@ minetest.register_craftitem("cucina_vegana:kohlrabi_roasted", { on_use = minetest.item_eat(4), }) -minetest.register_craftitem("cucina_vegana:sunflower_seeds_roasted", { - description = S("Roasted Sunflower Seeds"), - groups = {food = 1, eatable = 1}, - inventory_image = "cucina_vegana_sunflower_seeds_roasted.png", - on_use = minetest.item_eat(2), -}) +if not(minetest.get_modpath("farming")) then -minetest.register_craftitem("cucina_vegana:sunflower_seeds_bread", { - description = S("Sunflower Seeds Bread"), - groups = {food = 1, food_bread = 1, eatable = 1}, - inventory_image = "cucina_vegana_sunflower_seeds_bread.png", - on_use = minetest.item_eat(4), -}) + minetest.register_craftitem("cucina_vegana:sunflower_seeds_roasted", { + description = S("Roasted Sunflower Seeds"), + groups = {food = 1, eatable = 1}, + inventory_image = "cucina_vegana_sunflower_seeds_roasted.png", + on_use = minetest.item_eat(2), + }) -minetest.register_craftitem("cucina_vegana:tofu_cooked", { - description = S("Tofu"), - inventory_image = "cucina_vegana_tofu_cooked.png", - groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_tofu = 1}, - on_use = minetest.item_eat(3), -}) + minetest.register_craftitem("cucina_vegana:sunflower_seeds_bread", { + description = S("Sunflower Seeds Bread"), + groups = {food = 1, food_bread = 1, eatable = 1}, + inventory_image = "cucina_vegana_sunflower_seeds_bread.png", + on_use = minetest.item_eat(4), + }) + + minetest.register_craftitem("cucina_vegana:tofu_cooked", { + description = S("Tofu"), + inventory_image = "cucina_vegana_tofu_cooked.png", + groups = {flammable = 1, food = 1, eatable = 1, food_vegan = 1, food_tofu = 1, food_meat = 1}, + on_use = minetest.item_eat(3), + }) + +end minetest.register_craftitem("cucina_vegana:vegan_sushi", { description = S("Vegan Sushi"), diff --git a/mods/cucina_vegana/nodes.lua b/mods/cucina_vegana/nodes.lua index 9ab91e20..3e724b0a 100644 --- a/mods/cucina_vegana/nodes.lua +++ b/mods/cucina_vegana/nodes.lua @@ -93,6 +93,8 @@ minetest.register_node("cucina_vegana:plate", { sounds = default.node_sound_glass_defaults(), }) +if not(minetest.get_modpath("farming")) then + minetest.register_node("cucina_vegana:sunflower_seeds_oil", { description = S("Bottle of Sunflower Seeds Oil"), drawtype = "plantlike", @@ -129,6 +131,8 @@ minetest.register_node("cucina_vegana:corn_oil", { sounds = default.node_sound_glass_defaults(), }) +end + -- ******************************************* -- ***** Síde Dishes ***** -- ******************************************* @@ -357,24 +361,28 @@ minetest.register_node("cucina_vegana:sea_salad", { sounds = default.node_sound_glass_defaults(), }) -minetest.register_node("cucina_vegana:popcorn", { - description = S("Popcorn"), - drawtype = "plantlike", - tiles = {"cucina_vegana_popcorn.png"}, - inventory_image = "cucina_vegana_popcorn.png", - wield_image = "cucina_vegana_popcorn.png", - paramtype2 = 3, -- # - on_use = minetest.item_eat(3), - paramtype = "light", - is_ground_content = false, - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} - }, - groups = {dig_immediate = 3, attached_node = 1}, - sounds = default.node_sound_glass_defaults(), -}) +if not(minetest.get_modpath("x_farming")) then + + minetest.register_node("cucina_vegana:popcorn", { + description = S("Popcorn"), + drawtype = "plantlike", + tiles = {"cucina_vegana_popcorn.png"}, + inventory_image = "cucina_vegana_popcorn.png", + wield_image = "cucina_vegana_popcorn.png", + paramtype2 = 3, -- # + on_use = minetest.item_eat(3), + paramtype = "light", + is_ground_content = false, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} + }, + groups = {dig_immediate = 3, attached_node = 1}, + sounds = default.node_sound_glass_defaults(), + }) + +end -- ******************************************* -- ***** Dinners ***** @@ -431,6 +439,8 @@ minetest.register_node("cucina_vegana:asparagus_soup", { sounds = default.node_sound_glass_defaults(), }) +if not(minetest.get_modpath("x_farming")) then + minetest.register_node("cucina_vegana:bowl_rice", { description = S("Bowl of Rice (raw)"), drawtype = "plantlike", @@ -448,6 +458,8 @@ minetest.register_node("cucina_vegana:bowl_rice", { sounds = default.node_sound_glass_defaults(), }) +end + minetest.register_node("cucina_vegana:fish_parsley_rosemary", { description = S("Fish on Parsley and Rosemary (raw)"), drawtype = "plantlike", @@ -626,6 +638,8 @@ minetest.register_node("cucina_vegana:asparagus_soup_cooked", { sounds = default.node_sound_glass_defaults(), }) +if not(minetest.get_modpath("x_farming")) then + minetest.register_node("cucina_vegana:bowl_rice_cooked", { description = S("Bowl of Rice"), drawtype = "plantlike", @@ -644,6 +658,8 @@ minetest.register_node("cucina_vegana:bowl_rice_cooked", { sounds = default.node_sound_glass_defaults(), }) +end + minetest.register_node("cucina_vegana:fish_parsley_rosemary_cooked", { description = S("Fish on Parsley and Rosemary"), drawtype = "plantlike", diff --git a/mods/cucina_vegana/recipes.lua b/mods/cucina_vegana/recipes.lua index 5be7b45c..a444ec19 100644 --- a/mods/cucina_vegana/recipes.lua +++ b/mods/cucina_vegana/recipes.lua @@ -59,17 +59,36 @@ minetest.register_craft({ } }) +if not(minetest.get_modpath("farming")) then + minetest.register_craft({ output = "cucina_vegana:ciabatta_dough", - recipe = { {"cucina_vegana:soy_milk", "cucina_vegana:sunflower_seeds_oil", ""}, + recipe = { {"group:food_soy_milk", "cucina_vegana:sunflower_seeds_oil", ""}, {"group:food_flour", "cucina_vegana:rosemary", ""} }, replacements = { - {"cucina_vegana:soy_milk", "vessels:drinking_glass"}, + {"group:food_soy_milk", "vessels:drinking_glass"}, {"cucina_vegana:sunflower_seeds_oil", "vessels:glass_bottle"}, } }) +end + +if (minetest.get_modpath("farming")) then + + minetest.register_craft({ + output = "cucina_vegana:ciabatta_dough", + recipe = { {"group:food_soy_milk", "farming:sunflower_oil", ""}, + {"group:food_flour", "cucina_vegana:rosemary", ""} + }, + replacements = { + {"group:food_soy_milk", "vessels:drinking_glass"}, + {"farming:sunflower_oil", "vessels:glass_bottle"}, + } + }) + + end + minetest.register_craft({ output = "cucina_vegana:coffe_cup 4", recipe = { {"cucina_vegana:coffee_powder", "bucket:bucket_water", "default:paper"}, @@ -282,83 +301,88 @@ minetest.register_craft({ }) -minetest.register_craft({ - output = "cucina_vegana:rice_flour", - recipe = { {"default:stone", "default:stone", "default:stone"}, - {"cucina_vegana:rice", "cucina_vegana:rice", "cucina_vegana:rice"}, - {"default:cobble", "default:cobble", "default:cobble"} - }, - replacements = { - {"default:stone", "default:stone 3"}, - {"default:cobble", "default:cobble 3"} - } -}) +if not((minetest.get_modpath("x_farming"))and(minetest.get_modpath("farming"))) then -minetest.register_craft({ - output = "cucina_vegana:rice_flour", - recipe = { {"default:desert_stone", "default:desert_stone", "default:desert_stone"}, - {"cucina_vegana:rice", "cucina_vegana:rice", "cucina_vegana:rice"}, - {"default:cobble", "default:cobble", "default:cobble"} - }, - replacements = { - {"default:desert_stone", "default:desert_stone 3"}, - {"default:cobble", "default:cobble 3"} - } + minetest.register_craft({ + output = "cucina_vegana:rice_flour", + recipe = { {"default:stone", "default:stone", "default:stone"}, + {"cucina_vegana:rice", "cucina_vegana:rice", "cucina_vegana:rice"}, + {"default:cobble", "default:cobble", "default:cobble"} + }, + replacements = { + {"default:stone", "default:stone 3"}, + {"default:cobble", "default:cobble 3"} + } -}) + }) -minetest.register_craft({ - output = "cucina_vegana:rice_flour", - recipe = { {"default:desert_stone", "default:desert_stone", "default:desert_stone"}, - {"cucina_vegana:rice", "cucina_vegana:rice", "cucina_vegana:rice"}, - {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"} - }, - replacements = { - {"default:desert_stone", "default:desert_stone 3"}, - {"default:desert_cobble", "default:desert_cobble 3"} - } + minetest.register_craft({ + output = "cucina_vegana:rice_flour", + recipe = { {"default:desert_stone", "default:desert_stone", "default:desert_stone"}, + {"cucina_vegana:rice", "cucina_vegana:rice", "cucina_vegana:rice"}, + {"default:cobble", "default:cobble", "default:cobble"} + }, + replacements = { + {"default:desert_stone", "default:desert_stone 3"}, + {"default:cobble", "default:cobble 3"} + } -}) + }) -minetest.register_craft({ - output = "cucina_vegana:rice_flour", - recipe = { {"default:stone", "default:stone", "default:stone"}, - {"cucina_vegana:rice", "cucina_vegana:rice", "cucina_vegana:rice"}, - {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"} - }, - replacements = { - {"default:stone", "default:stone 3"}, - {"default:cobble", "default:cobble 3"} - } + minetest.register_craft({ + output = "cucina_vegana:rice_flour", + recipe = { {"default:desert_stone", "default:desert_stone", "default:desert_stone"}, + {"cucina_vegana:rice", "cucina_vegana:rice", "cucina_vegana:rice"}, + {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"} + }, + replacements = { + {"default:desert_stone", "default:desert_stone 3"}, + {"default:desert_cobble", "default:desert_cobble 3"} + } -}) + }) -minetest.register_craft({ - output = "cucina_vegana:rice_starch 2", - recipe = { {"wool:white", "cucina_vegana:rice", "wool:white"}, - {"wool:white", "cucina_vegana:rice", "wool:white"}, - {"", "bucket:bucket_water", ""} - }, - replacements = { - {"wool:white", "farming:cotton 2"}, - {"bucket:bucket_water", "bucket:bucket_empty"} - } + minetest.register_craft({ + output = "cucina_vegana:rice_flour", + recipe = { {"default:stone", "default:stone", "default:stone"}, + {"cucina_vegana:rice", "cucina_vegana:rice", "cucina_vegana:rice"}, + {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"} + }, + replacements = { + {"default:stone", "default:stone 3"}, + {"default:cobble", "default:cobble 3"} + } -}) + }) -minetest.register_craft({ - output = "cucina_vegana:rice_starch 2", - recipe = { {"wool:white", "cucina_vegana:rice", "wool:white"}, - {"wool:white", "cucina_vegana:rice", "wool:white"}, - {"", "bucket:bucket_river_water", ""} - }, - replacements = { - {"wool:white", "farming:cotton 2"}, - {"bucket:bucket_river_water", "bucket:bucket_empty"} - } + minetest.register_craft({ + output = "cucina_vegana:rice_starch 2", + recipe = { {"wool:white", "cucina_vegana:rice", "wool:white"}, + {"wool:white", "cucina_vegana:rice", "wool:white"}, + {"", "bucket:bucket_water", ""} + }, + replacements = { + {"wool:white", "farming:cotton 2"}, + {"bucket:bucket_water", "bucket:bucket_empty"} + } -}) + }) + + minetest.register_craft({ + output = "cucina_vegana:rice_starch 2", + recipe = { {"wool:white", "cucina_vegana:rice", "wool:white"}, + {"wool:white", "cucina_vegana:rice", "wool:white"}, + {"", "bucket:bucket_river_water", ""} + }, + replacements = { + {"wool:white", "farming:cotton 2"}, + {"bucket:bucket_river_water", "bucket:bucket_empty"} + } + + }) + +end minetest.register_craft({ output = "wool:white", @@ -373,10 +397,10 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:imitation_butter", - recipe = { {"group:dye,color_yellow", "cucina_vegana:soy_milk", "cucina_vegana:soy_milk"} + recipe = { {"group:dye,color_yellow", "group:food_soy_milk", "group:food_soy_milk"} }, replacements = { - {"cucina_vegana:soy_milk", "vessels:drinking_glass 2"} + {"group:food_soy_milk", "vessels:drinking_glass 2"} } }) @@ -389,26 +413,26 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:imitation_fish", recipe = { - {"group:dye,color_blue","cucina_vegana:tofu", "group:dye,color_blue"}, - {"cucina_vegana:tofu","cucina_vegana:tofu", "cucina_vegana:tofu"}, - {"","cucina_vegana:tofu", ""}, + {"group:dye,color_blue","group:food_tofu_raw", "group:dye,color_blue"}, + {"group:food_tofu_raw","group:food_tofu_raw", "group:food_tofu_raw"}, + {"","group:food_tofu_raw", ""}, }, }) minetest.register_craft({ output = "cucina_vegana:imitation_meat", - recipe = { {"group:dye,color_red", "cucina_vegana:tofu", "group:dye,color_white"}, - {"", "cucina_vegana:tofu", ""}, - {"", "cucina_vegana:tofu", ""} + recipe = { {"group:dye,color_red", "group:food_tofu_raw", "group:dye,color_white"}, + {"", "group:food_tofu_raw", ""}, + {"", "group:food_tofu_raw", ""} }, }) minetest.register_craft({ output = "cucina_vegana:imitation_poultry", - recipe = { {"cucina_vegana:tofu", "", "group:dye,color_yellow"}, - {"", "cucina_vegana:tofu", ""}, - {"cucina_vegana:tofu", "cucina_vegana:tofu", "cucina_vegana:tofu"} + recipe = { {"group:food_tofu_raw", "", "group:dye,color_yellow"}, + {"", "group:food_tofu_raw", ""}, + {"group:food_tofu_raw", "group:food_tofu_raw", "group:food_tofu_raw"} }, }) @@ -421,14 +445,32 @@ minetest.register_craft({ }, }) -minetest.register_craft({ - output = "cucina_vegana:tofu", - recipe = { - {"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"}, - }, -}) + +if (minetest.get_modpath("x_farming")) then + + minetest.register_craft({ + output = "x_farming:bottle_soymilk_raw", + recipe = { + {"group:food_soy", "group:food_soy", "group:food_soy"}, + {"", "group:food_soy", ""}, + {"", "vessels:glass_bottle", ""}, + }, + }) + +end + +if not(minetest.get_modpath("farming")) then + + minetest.register_craft({ + output = "cucina_vegana:tofu", + recipe = { + {"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"}, + }, + }) + +end -- ******************************************* -- ***** Side Dishes ***** @@ -454,29 +496,33 @@ minetest.register_craft({ }, }) -minetest.register_craft({ - output = "cucina_vegana:bowl_rice", - recipe = { - {"group:food_rice"}, - {"bucket:bucket_water"}, - {"group:food_bowl"}, - }, - replacements = { - {"bucket:bucket_water", "bucket:bucket_empty"}, - } -}) +if not(minetest.get_modpath("x_farming")) then -minetest.register_craft({ - output = "cucina_vegana:bowl_rice", - recipe = { - {"group:food_rice"}, - {"bucket:bucket_river_water"}, - {"group:food_bowl"}, - }, - replacements = { - {"bucket:bucket_river_water", "bucket:bucket_empty"}, - } -}) + minetest.register_craft({ + output = "cucina_vegana:bowl_rice", + recipe = { + {"group:food_rice"}, + {"bucket:bucket_water"}, + {"group:food_bowl"}, + }, + replacements = { + {"bucket:bucket_water", "bucket:bucket_empty"}, + } + }) + + minetest.register_craft({ + output = "cucina_vegana:bowl_rice", + recipe = { + {"group:food_rice"}, + {"bucket:bucket_river_water"}, + {"group:food_bowl"}, + }, + replacements = { + {"bucket:bucket_river_water", "bucket:bucket_empty"}, + } + }) + +end minetest.register_craft({ output = "cucina_vegana:dandelion_honey", @@ -501,14 +547,16 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:sauce_hollandaise", recipe = { {"group:food_parsley", "group:food_butter", "cucina_vegana:rosemary"}, - {"", "cucina_vegana:soy_milk", ""}, + {"", "group:food_soy_milk", ""}, {"", "vessels:glass_bottle", ""} }, replacements = { - {"cucina_vegana:soy_milk", "vessels:glass_bottle"} + {"group:food_soy_milk", "vessels:glass_bottle"} } }) +if not(minetest.get_modpath("farming")) then + minetest.register_craft({ output = "cucina_vegana:sunflower_seeds_oil", recipe = { {"cucina_vegana:sunflower_seeds", "cucina_vegana:sunflower_seeds", "cucina_vegana:sunflower_seeds"}, @@ -517,6 +565,8 @@ minetest.register_craft({ } }) +end + minetest.register_craft({ output = "cucina_vegana:molasses", recipe = { @@ -560,7 +610,7 @@ minetest.register_craft({ recipe = { {"cucina_vegana:strawberry", "default:stick", "cucina_vegana:strawberry"}, {"cucina_vegana:strawberry", "cucina_vegana:strawberry", "cucina_vegana:strawberry"}, - {"", "cucina_vegana:soy_milk", ""}, + {"", "group:food_soy_milk", ""}, }, replacements = { {"default:stick", "default:stick"}, @@ -572,7 +622,7 @@ minetest.register_craft({ recipe = { {"group:food_strawberry", "default:stick", "group:food_strawberry"}, {"group:food_strawberry", "group:food_strawberry", "group:food_strawberry"}, - {"", "cucina_vegana:soy_milk", ""}, + {"", "group:food_soy_milk", ""}, }, replacements = { {"default:stick", "default:stick"}, @@ -605,7 +655,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:asparagus_soup", recipe = { {"cucina_vegana:chives", "group:food_oil", "cucina_vegana:asparagus"}, - {"", "cucina_vegana:soy_milk", ""}, + {"", "group:food_soy_milk", ""}, {"", "group:food_plate", ""} }, replacements = {{"group:food_milk", "vessels:glass_bottle"}, @@ -717,7 +767,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:soy_soup", recipe = { {"cucina_vegana:chives", "group:food_oil", "group:food_parsley"}, - {"", "cucina_vegana:soy_milk", ""}, + {"", "group:food_soy_milk", ""}, {"", "group:food_plate", ""} }, replacements = {{"group:food_milk", "vessels:glass_bottle"}, @@ -728,14 +778,14 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:tofu_chives_rosemary", recipe = { {"cucina_vegana:chives", "", "cucina_vegana:rosemary"}, - {"", "cucina_vegana:tofu", ""}, + {"", "group:food_tofu_raw", ""}, {"", "group:food_plate", ""} }, }) minetest.register_craft({ output = "cucina_vegana:vegan_sushi", - recipe = { {"cucina_vegana:imitation_fish", "cucina_vegana:bowl_rice", ""}, + recipe = { {"cucina_vegana:imitation_fish", "group:food_rice", ""}, {"default:papyrus", "", ""} }, replacements = { @@ -747,6 +797,8 @@ minetest.register_craft({ -- ***** Miscelanous ***** -- ******************************************* +if not(minetest.get_modpath("farming")) then + minetest.register_craft({ type = "shapeless", output = "cucina_vegana:sunflower_seeds 4", @@ -770,6 +822,7 @@ minetest.register_craft({ } }) +end minetest.register_craft({ output = "default:paper 4", diff --git a/mods/cucina_vegana/recipes_5xx.lua b/mods/cucina_vegana/recipes_5xx.lua index d048dc7d..1ae44e19 100644 --- a/mods/cucina_vegana/recipes_5xx.lua +++ b/mods/cucina_vegana/recipes_5xx.lua @@ -9,7 +9,7 @@ local nodes = { name = "default:sand_with_kelp", -- Name output = "cucina_vegana:vegan_sushi", -- Output recipe = { -- Recipe - {"cucina_vegana:imitation_fish", "cucina_vegana:bowl_rice", ""}, + {"cucina_vegana:imitation_fish", "group:food_rice", ""}, {"default:sand_with_kelp", "", ""} }, --repclaements = nil -- Replacements diff --git a/mods/cucina_vegana/recipes_cook.lua b/mods/cucina_vegana/recipes_cook.lua index bba661c1..d510f3ab 100644 --- a/mods/cucina_vegana/recipes_cook.lua +++ b/mods/cucina_vegana/recipes_cook.lua @@ -30,12 +30,16 @@ minetest.register_craft({ recipe = "cucina_vegana:blueberry_pot" }) -minetest.register_craft({ - type = "cooking", - cooktime = 20, - output = "cucina_vegana:bowl_rice_cooked", - recipe = "cucina_vegana:bowl_rice" -}) +if not(minetest.get_modpath("x_farming")) then + + minetest.register_craft({ + type = "cooking", + cooktime = 20, + output = "cucina_vegana:bowl_rice_cooked", + recipe = "cucina_vegana:bowl_rice" + }) + +end minetest.register_craft({ type = "cooking", @@ -123,18 +127,22 @@ minetest.register_craft({ replacements = {{"cucina_vegana:molasses", "vessels:drinking_glass"}} }) -minetest.register_craft({ - type = "cooking", - cooktime = 15, - output = "cucina_vegana:sunflower_seeds_bread", - recipe = "cucina_vegana:sunflower_seeds_dough" -}) +if not(minetest.get_modpath("farming")) then -minetest.register_craft({ - type = "cooking", - output = "cucina_vegana:sunflower_seeds_roasted", - recipe = "cucina_vegana:sunflower_seeds" -}) + minetest.register_craft({ + type = "cooking", + cooktime = 15, + output = "cucina_vegana:sunflower_seeds_bread", + recipe = "cucina_vegana:sunflower_seeds_dough" + }) + + minetest.register_craft({ + type = "cooking", + output = "cucina_vegana:sunflower_seeds_roasted", + recipe = "cucina_vegana:sunflower_seeds" + }) + +end minetest.register_craft({ type = "cooking", @@ -143,6 +151,8 @@ minetest.register_craft({ recipe = "cucina_vegana:tofu_chives_rosemary" }) +if not(minetest.get_modpath("farming")) then + minetest.register_craft({ type = "cooking", output = "cucina_vegana:tofu_cooked", @@ -150,6 +160,8 @@ minetest.register_craft({ cooktime = 5, }) +end + minetest.register_craft({ type = "cooking", output = "cucina_vegana:flax_roasted", @@ -157,6 +169,8 @@ minetest.register_craft({ cooktime = 10, }) +if not(minetest.get_modpath("x_farming")) then + minetest.register_craft({ type = "cooking", output = "cucina_vegana:popcorn", @@ -177,3 +191,5 @@ minetest.register_craft({ recipe = "cucina_vegana:coffee_cup", cooktime = 10, }) + +end \ No newline at end of file diff --git a/mods/cucina_vegana/recipes_support.lua b/mods/cucina_vegana/recipes_support.lua index efe47803..29426021 100644 --- a/mods/cucina_vegana/recipes_support.lua +++ b/mods/cucina_vegana/recipes_support.lua @@ -77,14 +77,14 @@ if minetest.get_modpath("fishing") then type = "shapeless", output = "fishing:sushi", recipe = {"group:food_fish","group:food_rice","flowers:seaweed"}, - replacements = {{"group:food_rice", "cucina_vegana:bowl"}} + replacements = {{"cucina_vegana:bowl_rice", "cucina_vegana:bowl"}} }) minetest.register_craft({ type = "shapeless", output = "fishing:sushi", recipe = {"group:food_fish","group:food_rice","seaplants:kelpgreen"}, - replacements = {{"group:food_rice", "cucina_vegana:bowl"}} + replacements = {{"cucina_vegana:bowl_rice", "cucina_vegana:bowl"}} }) @@ -92,7 +92,7 @@ if minetest.get_modpath("fishing") then type = "shapeless", output = "fishing:sushi", recipe = {"group:food_fish","group:food_rice","seaplants:kelpgreen"}, - replacements = {{"group:food_rice", "cucina_vegana:bowl"}} + replacements = {{"cucina_vegana:bowl_rice", "cucina_vegana:bowl"}} }) @@ -100,7 +100,7 @@ if minetest.get_modpath("fishing") then type = "shapeless", output = "fishing:sushi", recipe = {"group:food_fish","group:food_rice","default:jungleleaves"}, - replacements = {{"group:food_rice", "cucina_vegana:bowl"}} + replacements = {{"cucina_vegana:bowl_rice", "cucina_vegana:bowl"}} }) @@ -608,7 +608,7 @@ if minetest.get_modpath("aqua_farming") then minetest.register_craft({ output = "cucina_vegana:vegan_sushi", - recipe = { {"cucina_vegana:imitation_fish", "cucina_vegana:bowl_rice", ""}, + recipe = { {"cucina_vegana:imitation_fish", "group:food_rice", ""}, {"aqua_farming:alga_item", "", ""} }, replacements = { diff --git a/mods/farming/item_food.lua b/mods/farming/item_food.lua index 33ad97ea..758064d6 100644 --- a/mods/farming/item_food.lua +++ b/mods/farming/item_food.lua @@ -608,12 +608,16 @@ farming.add_eatable("farming:cheese_vegan", 2) -- Vegan Butter +if not(minetest.get_modpath("cucina_vegana")) then + minetest.register_craftitem("farming:butter_vegan", { description = S("Vegan Butter"), inventory_image = "farming_vegan_butter.png", groups = {food_butter = 1} }) +end + -- Onigiri minetest.register_craftitem("farming:onigiri", { @@ -872,7 +876,7 @@ minetest.register_craftitem("farming:tofu", { description = S("Tofu"), inventory_image = "farming_tofu.png", groups = { - food_tofu = 1, food_meat_raw = 1, compostability = 65, + food_meat_raw = 1, compostability = 65, food_tofu_raw = 1 }, on_use = minetest.item_eat(3) }) @@ -884,7 +888,7 @@ farming.add_eatable("farming:tofu", 3) minetest.register_craftitem("farming:tofu_cooked", { description = S("Cooked Tofu"), inventory_image = "farming_tofu_cooked.png", - groups = {food_meat = 1, compostability = 65}, + groups = {food_meat = 1, compostability = 65, food_tofu = 1}, on_use = minetest.item_eat(6) }) @@ -933,6 +937,8 @@ minetest.register_craftitem("farming:sunflower_bread", { farming.add_eatable("farming:sunflower_bread", 8) + + -- Vanilla extract minetest.register_node("farming:vanilla_extract", { @@ -994,15 +1000,7 @@ if not farming.mcl then farming.add_eatable("farming:cookie", 2) - -- Golden carrot - minetest.register_craftitem("farming:carrot_gold", { - description = S("Golden Carrot"), - inventory_image = "farming_carrot_gold.png", - on_use = minetest.item_eat(10) - }) - - farming.add_eatable("farming:carrot_gold", 10) -- Beetroot soup @@ -1032,4 +1030,19 @@ if not farming.mcl then }) farming.add_eatable("farming:baked_potato", 6) + + -- Golden carrot + + if not(minetest.get_modpath("x_farming")) then + + minetest.register_craftitem("farming:carrot_gold", { + description = S("Golden Carrot"), + inventory_image = "farming_carrot_gold.png", + on_use = minetest.item_eat(10) + }) + + farming.add_eatable("farming:carrot_gold", 10) + end + + end diff --git a/mods/farming/item_non_food.lua b/mods/farming/item_non_food.lua index d118bf3d..9e2d775a 100644 --- a/mods/farming/item_non_food.lua +++ b/mods/farming/item_non_food.lua @@ -241,7 +241,7 @@ if not farming.mcl then minetest.register_craftitem("farming:string", { description = S("String"), inventory_image = "farming_string.png", - groups = {flammable = 2} + groups = {flammable = 2, thread = 1} }) -- Jack 'O Lantern diff --git a/mods/farming/item_recipes.lua b/mods/farming/item_recipes.lua index 69aa770d..50602db2 100644 --- a/mods/farming/item_recipes.lua +++ b/mods/farming/item_recipes.lua @@ -660,12 +660,12 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:cheese_vegan", recipe = { - {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, + {"group:food_soy_milk", "group:food_soy_milk", "group:food_soy_milk"}, {"group:food_salt", "group:food_peppercorn", "farming:bottle_ethanol"}, {"group:food_gelatin", a.pot, ""} }, replacements = { - {"farming:soy_milk", a.drinking_glass .. " 3"}, + {"group:food_soy_milk", a.drinking_glass .. " 3"}, {"farming:pot", "farming:pot"}, {"farming:bottle_ethanol", a.glass_bottle} } @@ -674,30 +674,51 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:cheese_vegan", recipe = { - {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, + {"group:food_soy_milk", "group:food_soy_milk", "group:food_soy_milk"}, {"group:food_salt", "group:food_peppercorn", "group:food_lemon"}, {"group:food_gelatin", a.pot, ""} }, replacements = { - {"farming:soy_milk", a.drinking_glass .. " 3"}, + {"group:food_soy_milk", a.drinking_glass .. " 3"}, {"farming:pot", "farming:pot"} } }) -- vegan butter -minetest.register_craft({ - output = "farming:butter_vegan", - recipe = { - {"farming:soy_milk", "farming:sunflower_oil", "farming:soy_milk"}, - {"group:food_salt", a.dye_yellow, "farming:mixing_bowl"} - }, - replacements = { - {"farming:soy_milk", a.drinking_glass .. " 2"}, - {"farming:sunflower_oil", a.glass_bottle}, - {"farming:mixing_bowl", "farming:mixing_bowl"} - } +if not(minetest.get_modpath("cucina_vegana")) then + + minetest.register_craft({ + output = "farming:butter_vegan", + recipe = { + {"group:food_soy_milk", "farming:sunflower_oil", "group:food_soy_milk"}, + {"group:food_salt", a.dye_yellow, "farming:mixing_bowl"} + }, + replacements = { + {"group:food_soy_milk", a.drinking_glass .. " 2"}, + {"farming:sunflower_oil", a.glass_bottle}, + {"farming:mixing_bowl", "farming:mixing_bowl"} + } }) +end + +if minetest.get_modpath("cucina_vegana") then + + minetest.register_craft({ + output = "cucina_vegana:imitation_butter", + recipe = { + {"group:food_soy_milk", "farming:sunflower_oil", "group:food_soy_milk"}, + {"group:food_salt", a.dye_yellow, "farming:mixing_bowl"} + }, + replacements = { + {"group:food_soy_milk", a.drinking_glass .. " 2"}, + {"farming:sunflower_oil", a.glass_bottle}, + {"farming:mixing_bowl", "farming:mixing_bowl"} + } + }) + + +end -- onigiri @@ -916,6 +937,36 @@ minetest.register_craft({ replacements = {{"group:food_baking_tray", "farming:baking_tray"}} }) +if minetest.get_modpath("cucina_vegana") then + + -- rice flour + + minetest.register_craft({ + output = "farming:rice_flour", + recipe = { + {"cucina_vegana:rice", "cucina_vegana:rice", "cucina_vegana:rice"}, + {"cucina_vegana:rice", a.mortar_pestle, ""} + }, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} + }) + +end + +if minetest.get_modpath("x_farming") then + + -- rice flour + +minetest.register_craft({ + output = "farming:rice_flour", + recipe = { + {"x_farming:rice_grains", "x_farming:rice_grains", "x_farming:rice_grains"}, + {"x_farming:rice_grains", a.mortar_pestle, ""} + }, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} +}) + +end + -- rice flour minetest.register_craft({ @@ -927,6 +978,7 @@ minetest.register_craft({ replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) + -- rice bread minetest.register_craft({ diff --git a/mods/naturalbiomes/bushland.lua b/mods/naturalbiomes/bushland.lua index 9ea42cb2..3a5444ec 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 + leafdecay = 1, leafdecay_drop = 1, food_blackberry = 1 }, drop = "naturalbiomes:blackberry", on_use = minetest.item_eat(2), diff --git a/mods/sandwiches/crops/peanuts.lua b/mods/sandwiches/crops/peanuts.lua index d539fbad..b9d33481 100644 --- a/mods/sandwiches/crops/peanuts.lua +++ b/mods/sandwiches/crops/peanuts.lua @@ -11,7 +11,7 @@ if minetest.global_exists("farming") and farming.mod == "redo" then inventory_image = "sandwiches_seed_peanut.png", wield_image = "sandwiches_seed_peanut.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 4}, + groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 4, seed_peanut = 1}, paramtype = "light", paramtype2 = "wallmounted", walkable = false, @@ -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}, + groups = {food = 2, food_peanut_butter = 1, flammable = 1, food_butter = 1}, inventory_image = "sandwiches_peanut_butter.png" }) diff --git a/mods/x_farming/corn.lua b/mods/x_farming/corn.lua index 833d74e9..3a4fcf85 100644 --- a/mods/x_farming/corn.lua +++ b/mods/x_farming/corn.lua @@ -41,6 +41,7 @@ local corn_def = { compost = 50, -- MCL compostability = 50, + food_corn = 1 }, } diff --git a/mods/x_farming/salt.lua b/mods/x_farming/salt.lua index 35da3036..99a05ab8 100644 --- a/mods/x_farming/salt.lua +++ b/mods/x_farming/salt.lua @@ -32,6 +32,17 @@ minetest.register_craftitem('x_farming:salt', { wield_image = 'x_farming_salt.png' }) +-- needed +local salt_def = { + description = S('Salt'), + short_description = S('Salt'), + groups = { + food_salt = 1 + }, +} + +minetest.override_item('x_farming:salt', salt_def) + minetest.register_node('x_farming:seed_salt', { description = S('Salty Water (plant soil)'), short_description = S('Salty Water (plant soil)'),