diff --git a/README.md b/README.md index 7064b61..603e0c8 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t ### Changelog: -- 1.39 - Added Rice, Rye and Oats thanks to Ademants Grains mod. Added Jaffa Cake. +- 1.39 - Added Rice, Rye and Oats thanks to Ademants Grains mod. Added Jaffa Cake and multigrain bread. - 1.38 - Pumpkin grows into block, use chopping board to cut into 4x slices, same with melon block, 2x2 slices makes a block, cocoa pods are no longer walkable - 1.37 - Added custom 'growth_check(pos, nodename) function for crop nodes to use (check cocoa.lua for example) - 1.36 - Added Beetroot, Beetroot Soup (6x beetroot, 1x bowl), fix register_plant() issue, add new recipes diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua index 934b160..d064626 100644 --- a/crops/ryeoatrice.lua +++ b/crops/ryeoatrice.lua @@ -1,4 +1,6 @@ +local S = farming.intllib + --= A nice addition from Ademant's grain mod :) -- Rye @@ -93,6 +95,40 @@ minetest.register_craft({ recipe = "farming:rice_flour" }) +-- Multigrain flour + +minetest.register_craftitem("farming:flour_multigrain", { + description = S("Multigrain Flour"), + inventory_image = "farming_flour_multigrain.png", + groups = {food_flour = 1, flammable = 1}, +}) + +minetest.register_craft({ + type = "shapeless", + output = "farming:flour_multigrain", + recipe = { + "farming:wheat", "farming:barley", "farming:oat", + "farming:rye", "farming:mortar_pestle" + }, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, +}) + +-- Multigrain bread + +minetest.register_craftitem("farming:bread_multigrain", { + description = S("Multigrain Bread"), + inventory_image = "farming_bread_multigrain.png", + on_use = minetest.item_eat(7), + groups = {food_bread = 1, flammable = 2}, +}) + +minetest.register_craft({ + type = "cooking", + cooktime = 15, + output = "farming:bread_multigrain", + recipe = "farming:flour_multigrain" +}) + -- Fuels minetest.register_craft({ @@ -101,6 +137,12 @@ minetest.register_craft({ burntime = 1, }) +minetest.register_craft({ + type = "fuel", + recipe = "farming:bread_multigrain", + burntime = 1, +}) + minetest.register_craft({ type = "fuel", recipe = "farming:rye", diff --git a/init.lua b/init.lua index 6e8e9b5..98479a3 100644 --- a/init.lua +++ b/init.lua @@ -457,7 +457,7 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname) minetest.set_node(pt.above, {name = plantname, param2 = p2}) --minetest.get_node_timer(pt.above):start(1) -farming.handle_growth(pt.above)--, node) +--farming.handle_growth(pt.above)--, node) minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0}) diff --git a/license.txt b/license.txt index 480aa8e..ce06d3c 100644 --- a/license.txt +++ b/license.txt @@ -133,3 +133,9 @@ Created by ademant (CC-BY-3.0) farming_rye*.png farming_oat*.png farming_rice*.png + +Created by PilzAdam and edited by SpaghettiToastBook (CC0): + farming_bread_multigrain.png + +Created by VanessaE and edited by SpaghettiToastBook (CC0): + farming_flour_multigrain.png diff --git a/textures/farming_bread_multigrain.png b/textures/farming_bread_multigrain.png new file mode 100644 index 0000000..66dda07 Binary files /dev/null and b/textures/farming_bread_multigrain.png differ diff --git a/textures/farming_flour_multigrain.png b/textures/farming_flour_multigrain.png new file mode 100644 index 0000000..5367bc5 Binary files /dev/null and b/textures/farming_flour_multigrain.png differ