From 0d3faf53e7736bfd332484dc5bbc385583336ccd Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Thu, 24 Jan 2019 11:38:21 +0000
Subject: [PATCH] added multigrain flour and bread

---
 README.md                             |   2 +-
 crops/ryeoatrice.lua                  |  42 ++++++++++++++++++++++++++
 init.lua                              |   2 +-
 license.txt                           |   6 ++++
 textures/farming_bread_multigrain.png | Bin 0 -> 583 bytes
 textures/farming_flour_multigrain.png | Bin 0 -> 161 bytes
 6 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 textures/farming_bread_multigrain.png
 create mode 100644 textures/farming_flour_multigrain.png

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 0000000000000000000000000000000000000000..66dda0746056badd67fff3708c7b4a1e74799249
GIT binary patch
literal 583
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47~KPWLR{I{*iwB}3WK$(;xsE_
zRGig0997sHRM>nqd7=&3Gkv8Ul-Z)~fk>p#S1H<_2f_vl0+l%_u{o)*xhS)_sIt3g
zaJVY5xvH?as<OK&v$?6UyQ#B#sIYmcvU#eod8)B_s&ja$viWGT`{=Rzs)Ee-Q)Tm0
zXY<oy_cLJkH)0FW;Rw*>2r%FXFk%ld;ttYc4>INnR%Qz};0aM-3(;Z=(P0m<U<<Wi
z4>Mv5Gv*K1=ZP?4i!kAd)M1M>V2d<ki?m>iv}KP{XN%Hgi!x!0GG&W02O{<;8}=w$
zo@h<BXfwWOTefIBAYzZU69D^#J;qEZ#*Qt<jy=|nBi5ch&W<bImN(v>E8Y=^_!2Bc
z5*>Mxti+S-MUpK<QmrLY?IkiDL^2(uGMz;-T|}~6B@5l94_)3-0t{K9k|4ie21Z6E
zmhV4)1Hm64`1|jl;c259pzK^v7sn8ZsmTcn!WkT#o*o+x?VNLO-?}WTYr9tE2-x*E
zO-l5MnzV1u1_A2{r%x=^)p|SORlZo-5(Skbj3N)W3T*c_444+WZL8tbCv03CQITpd
zPIh;CtgNWmb((?ohjWu}&(<qvMNRKA?fD}iG2_P~r`kDhW9Q73VP;}xb=dag$Wb?U
zHdfb`_VyMB*-3M!&XkxxZz9h_!{i;aS@&;e;5{vQUEosVWS~PCJYD@<);T3K0RSDF
Bq*?#~

literal 0
HcmV?d00001

diff --git a/textures/farming_flour_multigrain.png b/textures/farming_flour_multigrain.png
new file mode 100644
index 0000000000000000000000000000000000000000..5367bc5809e9af422852734d821ed0c4390c375a
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=3666xOCFO%9fs878|b
zNpWtZ+)RzfML-G0k|4ie28U-i(tsQ*PZ!4!j_BkB1<@rc4kbHQtZK+K3snu>Fk$kf
zNvk*_90Ec@Bu*r7iin7?bXqWFI!^G|WGG<qV6z}Yx;*Ru3Ag^Y0Zn1>boFyt=akR{
E03*&XKL7v#

literal 0
HcmV?d00001