diff --git a/extra.lua b/extra.lua index dc9aece..8e478bb 100644 --- a/extra.lua +++ b/extra.lua @@ -268,18 +268,16 @@ minetest.register_craft({ } }) --- Wooden Bowl - -minetest.register_craftitem("ethereal:bowl", { - description = S("Bowl"), - inventory_image = "ethereal_bowl.png", - groups = {food_bowl = 1, flammable = 2} -}) - --- dont add bowl recipe if farming redo already has one +-- wooden bowl, dont add bowl if farming redo already has one if not minetest.registered_items["farming:bowl"] then + minetest.register_craftitem("ethereal:bowl", { + description = S("Bowl"), + inventory_image = "ethereal_bowl.png", + groups = {food_bowl = 1, flammable = 2} + }) + minetest.register_craft({ output = "ethereal:bowl 4", recipe = { diff --git a/food.lua b/food.lua index 885062a..41c4b36 100644 --- a/food.lua +++ b/food.lua @@ -1,5 +1,13 @@ +-- translator and mod check + local S = minetest.get_translator("ethereal") +local mod_fredo = minetest.get_modpath("farming") + and farming and farming.mod and farming.mod == "redo" + +-- replacement bowl + +local bowl = mod_fredo and "farming:bowl" or "ethereal:bowl" -- Banana @@ -248,7 +256,7 @@ minetest.register_craftitem("ethereal:hearty_stew", { description = S("Hearty Stew"), inventory_image = "ethereal_hearty_stew.png", wield_image = "ethereal_hearty_stew.png", - on_use = minetest.item_eat(10, "ethereal:bowl") + on_use = minetest.item_eat(10, bowl) }) ethereal.add_eatable("ethereal:hearty_stew", 10) @@ -558,7 +566,7 @@ minetest.register_craft({ minetest.register_craftitem("ethereal:teriyaki_beef", { description = S("Teriyaki Beef"), inventory_image = "ethereal_teriyaki_beef.png", - on_use = minetest.item_eat(12, "ethereal:bowl") + on_use = minetest.item_eat(12, bowl) }) ethereal.add_eatable("ethereal:teriyaki_beef", 12) @@ -582,7 +590,7 @@ minetest.register_craftitem("ethereal:mushroom_soup", { description = S("Mushroom Soup"), inventory_image = "ethereal_mushroom_soup.png", groups = {drink = 1}, - on_use = minetest.item_eat(5, "ethereal:bowl") + on_use = minetest.item_eat(5, bowl) }) ethereal.add_eatable("ethereal:mushroom_soup", 5) diff --git a/textures/ethereal_teriyaki_beef.png b/textures/ethereal_teriyaki_beef.png index 613adb9..dd94344 100644 Binary files a/textures/ethereal_teriyaki_beef.png and b/textures/ethereal_teriyaki_beef.png differ diff --git a/textures/ethereal_teriyaki_beef_32px.png b/textures/ethereal_teriyaki_beef_32px.png new file mode 100644 index 0000000..613adb9 Binary files /dev/null and b/textures/ethereal_teriyaki_beef_32px.png differ