diff --git a/barley.lua b/barley.lua index 66ba071..4005d2c 100644 --- a/barley.lua +++ b/barley.lua @@ -30,7 +30,11 @@ minetest.register_craftitem("farming:barley", { minetest.register_craft({ type = "shapeless", output = "farming:flour", - recipe = {"farming:barley", "farming:barley", "farming:barley", "farming:barley"} + recipe = { + "farming:barley", "farming:barley", "farming:barley", + "farming:barley", "farming:mortar_pestle" + }, + replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}}, }) -- barley definition diff --git a/donut.lua b/donut.lua index 8c66da5..f3dfbce 100644 --- a/donut.lua +++ b/donut.lua @@ -51,31 +51,26 @@ minetest.register_craft({ minetest.register_craftitem("farming:porridge", { description = S("Porridge"), inventory_image = "farming_porridge.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(6, "farming:bowl"), }) minetest.after(0, function() + local fluid = "bucket:bucket_water" + local fluid_return = "bucket:bucket_water" + if minetest.get_modpath("mobs") and mobs and mobs.mod == "redo" then + fluid = "group:food_milk" + fluid_return = "mobs:bucket_milk" + end minetest.register_craft({ - output = "farming:porridge", type = "shapeless", + output = "farming:porridge", recipe = { "group:food_barley", "group:food_barley", "group:food_wheat", - "group:food_wheat", "group:food_milk" + "group:food_wheat", "group:food_bowl", fluid }, - replacements = {{"mobs:bucket_milk", "bucket:bucket_empty"}} + replacements = {{fluid_return, "bucket:bucket_empty"}} }) -else - minetest.register_craft({ - output = "farming:porridge", - type = "shapeless", - recipe = { - "group:food_barley", "group:food_barley", "group:food_wheat", - "group:food_wheat", "bucket:bucket_water" - }, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} - }) - end end) diff --git a/rhubarb.lua b/rhubarb.lua index 014ccf9..1fa897f 100644 --- a/rhubarb.lua +++ b/rhubarb.lua @@ -22,10 +22,11 @@ minetest.register_craftitem("farming:rhubarb_pie", { minetest.register_craft({ output = "farming:rhubarb_pie", recipe = { - {"", "group:food_sugar", ""}, + {"farming:baking_tray", "group:food_sugar", ""}, {"group:food_rhubarb", "group:food_rhubarb", "group:food_rhubarb"}, {"group:food_wheat", "group:food_wheat", "group:food_wheat"}, - } + }, + replacements = {{"farming:baking_tray", "farming:baking_tray"}} }) -- rhubarb definition diff --git a/textures/farming_bread_slice.png b/textures/farming_bread_slice.png new file mode 100644 index 0000000..ff2714d Binary files /dev/null and b/textures/farming_bread_slice.png differ diff --git a/textures/farming_toast.png b/textures/farming_toast.png new file mode 100644 index 0000000..8a4524e Binary files /dev/null and b/textures/farming_toast.png differ diff --git a/textures/farming_toast_sandwich.png b/textures/farming_toast_sandwich.png new file mode 100644 index 0000000..c60ff5a Binary files /dev/null and b/textures/farming_toast_sandwich.png differ diff --git a/wheat.lua b/wheat.lua index 494b543..1b22723 100644 --- a/wheat.lua +++ b/wheat.lua @@ -61,7 +61,11 @@ minetest.register_craftitem("farming:flour", { minetest.register_craft({ type = "shapeless", output = "farming:flour", - recipe = {"farming:wheat", "farming:wheat", "farming:wheat", "farming:wheat"} + recipe = { + "farming:wheat", "farming:wheat", "farming:wheat", + "farming:wheat", "farming:mortar_pestle" + }, + replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}}, }) -- bread @@ -79,6 +83,53 @@ minetest.register_craft({ recipe = "farming:flour" }) +-- 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, flammable = 2}, +}) + +minetest.register_craft({ + type = "shapeless", + output = "farming:bread_slice 5", + recipe = {"farming:bread", "group:food_cutting_board"}, + replacements = {{"farming:cutting_board", "farming:cutting_board"}}, +}) + +-- toast +minetest.register_craftitem("farming:toast", { + description = S("Toast"), + inventory_image = "farming_toast.png", + on_use = minetest.item_eat(1), + groups = {food_toast = 1, flammable = 2}, +}) + +minetest.register_craft({ + type = "cooking", + cooktime = 3, + output = "farming:toast", + recipe = "farming:bread_slice" +}) + +-- toast sandwich +minetest.register_craftitem("farming:toast_sandwich", { + description = S("Toast Sandwich"), + inventory_image = "farming_toast_sandwich.png", + on_use = minetest.item_eat(4), + groups = {flammable = 2}, +}) + +minetest.register_craft({ + output = "farming:toast_sandwich", + recipe = { + {"farming:bread_slice"}, + {"farming:toast"}, + {"farming:bread_slice"}, + } +}) + -- wheat definition local crop_def = { drawtype = "plantlike",