From 4f6c3085a3478d1fa1615af8a710b5a96507b554 Mon Sep 17 00:00:00 2001
From: PilzAdam <pilzadam@minetest.net>
Date: Mon, 27 May 2013 16:53:01 +0200
Subject: [PATCH] Add gold nuggets and golden apples; fix farming mod

---
 mods/default/crafting.lua                     |  24 ++++++++++++++++++
 mods/default/craftitems.lua                   |  13 ++++++++++
 mods/default/textures/default_apple_gold.png  | Bin 0 -> 273 bytes
 mods/default/textures/default_gold_nugget.png | Bin 0 -> 351 bytes
 mods/farming/init.lua                         |   2 +-
 mods/farming/textures/farming_flour.png       | Bin 459 -> 0 bytes
 6 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 mods/default/textures/default_apple_gold.png
 create mode 100644 mods/default/textures/default_gold_nugget.png
 delete mode 100644 mods/farming/textures/farming_flour.png

diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index 5278c17..df32193 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -286,6 +286,30 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	type = 'shapeless',
+	output = 'default:gold_nugget 9',
+	recipe = {'default:gold_ingot'},
+})
+
+minetest.register_craft({
+	output = 'default:gold_ingot',
+	recipe = {
+		{'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'},
+		{'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'},
+		{'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'},
+	},
+})
+
+minetest.register_craft({
+	output = 'default:apple_gold',
+	recipe = {
+		{'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'},
+		{'default:gold_nugget', 'default:apple', 'default:gold_nugget'},
+		{'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'},
+	},
+})
+
 minetest.register_craft({
 	output = 'default:diamondblock',
 	recipe = {
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index b73b2d9..d8674e0 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -56,6 +56,12 @@ minetest.register_craftitem("default:gold_ingot", {
 	stack_max = 64,
 })
 
+minetest.register_craftitem("default:gold_nugget", {
+	description = "Gold Nugget",
+	inventory_image = "default_gold_nugget.png",
+	stack_max = 64,
+})
+
 minetest.register_craftitem("default:clay_brick", {
 	description = "Clay Brick",
 	inventory_image = "default_clay_brick.png",
@@ -74,3 +80,10 @@ minetest.register_craftitem("default:apple", {
 	stack_max = 64,
 	on_use = minetest.item_eat(1),
 })
+
+minetest.register_craftitem("default:apple_gold", {
+	description = "Golden Apple",
+	inventory_image = "default_apple_gold.png",
+	stack_max = 64,
+	on_use = minetest.item_eat(6),
+})
diff --git a/mods/default/textures/default_apple_gold.png b/mods/default/textures/default_apple_gold.png
new file mode 100644
index 0000000000000000000000000000000000000000..75f862fe72749a8d58867f4de69684ec5a11a1cc
GIT binary patch
literal 273
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4&HECyrsn$JLrv%n*=
zn1O-sFbFdq&tH)O6l5>)^mS#w%PP%hA}rCCItM5;&(p;*#NzbZi5s~N1@O3@*IvKc
z@6y5j6S#Esc3JHx`>q^2cgceDC-Yw_?K|SACE~QYV@HLefY7_MzD)IBlvZDODfV~n
ziInEFQ2U#aM-S_ndv=!=G&AW|&O2}QHrQgeQm5%ko$wzeJ^t?JHM*AWY%>2|6q~%N
z>v0;FigSBNsKTO4d)_^8%qnK=?b!2h!Mg7qF^wJ02UTSbKef*PBT+u%sKwVu3q`7d
PE@kj^^>bP0l+XkK8SH3e

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_gold_nugget.png b/mods/default/textures/default_gold_nugget.png
new file mode 100644
index 0000000000000000000000000000000000000000..513f8f3aa7cb8217467dbf0b97ad8b3336b942a5
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4&HECyrsn$JLrv%n*=
zn1O*?7=#%aX3dcR3bL1Y`ns~;WtHYLX0k26yb>t%#?!?y#NzbbiF>_R0(sp0-~Hjz
z=IDy}StQ04^;;n9+P)UMNv#_mt=X_(!?`nif9fnNxH41Jo3}+^(wqr3AD*9m##LLa
zXQ1=s$?xmmv=7{V-0AS-s2;;RS&cxsdpG(U-o5mRkPvODR{56w#J2nKZhzy4+6OLc
z%gz6IW5O=>q-uXLm%uAmtl7VuU3u*9Pm9jg+$YU<d}mp$u-cJXM5uQ6k-aHm4XFvD
zimN9)Dp<(t*wvEMc=8#eqKH7($@^YRLK<h8&m3A3GRZ(GsJmu!EbCf*)2)#&TSdaB
uxNpB5x?!*O<Rk6YpIWN_nEmm8Bm3iVRmY2qO{PG9GkCiCxvX<aXaWEj366pQ

literal 0
HcmV?d00001

diff --git a/mods/farming/init.lua b/mods/farming/init.lua
index 8de8d90..16f6d4c 100644
--- a/mods/farming/init.lua
+++ b/mods/farming/init.lua
@@ -361,7 +361,7 @@ minetest.register_craftitem("farming:bread", {
 
 minetest.register_craft({
 	output = "farming:bread",
-	recipe = {"farming:wheat", "farming:wheat", "farming:wheat"},
+	recipe = {{"farming:wheat", "farming:wheat", "farming:wheat"}},
 })
 
 for i=1,8 do
diff --git a/mods/farming/textures/farming_flour.png b/mods/farming/textures/farming_flour.png
deleted file mode 100644
index ae6e4ee24c9428b6e3387a8f7ffc1bdb631006a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 459
zcmV;+0W|)JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-sl6%7IxbZ+^Y0004MNkl<ZILqykL9XI35JX>s<JcG!
zkYIz@a0c#w1rC6K4XYr;B5`73lJ+b{`kJqqIlxHscHOG3E~((3C;QX#cDp5|6k2OU
zgt9DYnuf#S@S8sWb+}wEsjlm^-EMKtF-;T37?e_cJ|FJ)d-`jFx~`LRju_+Dk%-Xu
zJ?r%v5y5*;*LCc6yX>36^Z86EB{rK4Aq0#ugb=>Iq?E|>oRktx(_oCD>pJ%PeU_ci
z=VXkbsw&>^H>=eO?>*L9%CaPcfQXP%q9_WiwLBgVwAREJ$!D_}#u%n)0>FFEVzHno
z3PK2UUB_~{q%2FOX`*Qwlu``C!0YuwbzO(GmZB&S5vFOPZChfDlx2z58t*-A+v1$V
zdyn@Xtu;;4kX^6WBqCUAf7X)cjN^z>iWnnRRWS?$!!XeIJ@fe-5h2U6?=758r<78{
zImbATWLZX@=foHh5sWd6<A{hbjw8q8G2=e~`~aUV$=sPmyX61?002ovPDHLkV1gf=
B%*y}(