From b4f69fc04572d511f25d2060d46aea4d836a59ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Thu, 21 Jul 2016 20:27:21 +0200
Subject: [PATCH] Dough

---
 graphics/dough.xcf                              | Bin 0 -> 2166 bytes
 src/java/mmm/food/FIngredients.java             |  16 ++++++++++++++++
 src/resources/assets/mmm/lang/en_US.lang        |   1 +
 .../mmm/models/item/food/ingredient/dough.json  |   6 ++++++
 .../textures/items/food/ingredient/dough.png    | Bin 0 -> 453 bytes
 5 files changed, 23 insertions(+)
 create mode 100644 graphics/dough.xcf
 create mode 100644 src/resources/assets/mmm/models/item/food/ingredient/dough.json
 create mode 100644 src/resources/assets/mmm/textures/items/food/ingredient/dough.png

diff --git a/graphics/dough.xcf b/graphics/dough.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..4833ae4688b56a85a79e815089572e7d3df2002c
GIT binary patch
literal 2166
zcmd5++fEZv6y0;?J}se2<zh@IAs|FriWh=WNV#axD5S#|aA}7zg_0>mNE3bYQGGVX
z5Ae}vpG-f&hyH;-fZW5lc9|h<T3-n}S?8>?_g-^O_C9kQcVjEDyP8kr-9nCFu>j0(
z0Fs2E12ASjD_<GlaX<k$p)=r|cMJJ<FvlExHtB9GJGrFexodC{;t~y&w)YCTM5$PC
z*M_a3yt7&?6urbyZAyC1%5ox|O4qCf84E(gkgl|lhVjJz2}^fNTg$8Nrjr;8_kwe;
zl{4@qcQ)PaguA)Ao-47wn9rAT+m{Dqb+hZj(<tRS1SWkV5`R#}-$dHa(2F^20M}EW
zDSB%;kE0sECGP@^fOCo&a7@Id=NvW*2zjKAN9%Z79d8Hc?}ny>u%267-|iqTrUDWk
z7rDZ2^obQ-zsD&<#7XuoI`>JC@HHm2L1t!L_(LY~(xOwJsMU;MEyEzm7o4i|pzu)p
zq>2q{pEa>1pTDuLOY6&P#kcGhJix;GV!tb`FYg`JmunfA{4F4L^_71#`s81{enRJE
zijpWtNiJKYT*4%^tdLcf0fo%6Mta$RFMf3r2?sk9MvNkKro{)*&l3^tpL~s5d!oe0
zUfN8|zNtkUH9ywksrhV{WZIX6tVX);Wfp834ceFWwwpcu59b!LHlly6?!oj#=0$eN
zCY26HW?sBnWNy-V)|Tw1W?S>Fvt9tUxm?$w&-||irhW)WU7yu2jXw1|uj8cp2I=^1
z3}3B5_jS_XQ+>4h5*98zu7m&hiWH~A_eTd%{KL`Av!^4sqcWOuke<qn-|dPh5`M{p
z^z`(Dz7A8C5ILHjpXiTi0)04|ou5s0>Jon4<GJUP1MM<jg3R<pZ$x7DXgt+pNPI*3
zdt)k-(^$J9_%10zq6scaST%kLwYlPsv(Db@&|{eoa$)+LfP|;TTdBWm^ywdYjUHFg
z<ElnxRiQ{#P+L`M0Tcmo6L~uF)oPrT6(}oER-mjvS%I<%P$F(3Pe;C5sVO}uJt#dW
xJt#dWn*b%^Ch~OTs~#))HRl^?`cUG%jo>YA^P#?kpeTG6Zmfws9r^qm{{vOrI2-@~

literal 0
HcmV?d00001

diff --git a/src/java/mmm/food/FIngredients.java b/src/java/mmm/food/FIngredients.java
index 5ebfb56..a237ab6 100644
--- a/src/java/mmm/food/FIngredients.java
+++ b/src/java/mmm/food/FIngredients.java
@@ -1,10 +1,13 @@
 package mmm.food;
 
 
+import mmm.MmmMaterials;
 import mmm.core.CRegistry;
 import mmm.core.api.I_RecipeRegistrar;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 
 
 
@@ -12,6 +15,7 @@ public class FIngredients
 		implements I_RecipeRegistrar
 {
 	public final Item FLOUR;
+	public final Item DOUGH;
 
 
 	public FIngredients( )
@@ -19,6 +23,7 @@ public class FIngredients
 		CRegistry.addRegistrar( this );
 
 		this.FLOUR = FHelpers.makeIngredient( "flour" );
+		this.DOUGH = FHelpers.makeIngredient( "dough" );
 	}
 
 
@@ -27,6 +32,17 @@ public class FIngredients
 	{
 		FHelpers.addTransform( Items.WHEAT , this.FLOUR );
 		FHelpers.addCooking( this.FLOUR , Items.BREAD );
+		GameRegistry.addShapedRecipe( new ItemStack( Items.CAKE ) , //
+				"MMM" , //
+				"SES" , //
+				" F " , //
+				'M' , Items.MILK_BUCKET , //
+				'S' , Items.SUGAR , //
+				'E' , Items.EGG , //
+				'F' , this.FLOUR );
+
+		GameRegistry.addShapelessRecipe( new ItemStack( this.DOUGH ) , //
+				this.FLOUR , Items.WATER_BUCKET , MmmMaterials.ITEM.ROCK_SALT );
 	}
 
 }
diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index 87bc1b7..04f798b 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -155,6 +155,7 @@ item.mmm.food.milk.horse.name=Horse milk
 item.mmm.food.milk.donkey.name=Donkey milk
 
 item.mmm.food.ingredient.flour.name=Wheat Flour
+item.mmm.food.ingredient.dough.name=Dough
 
 item.mmm.food.meal.sausage.raw.name=Raw Sausage
 item.mmm.food.meal.sausage.cooked.name=Sausage
diff --git a/src/resources/assets/mmm/models/item/food/ingredient/dough.json b/src/resources/assets/mmm/models/item/food/ingredient/dough.json
new file mode 100644
index 0000000..ea30e81
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/food/ingredient/dough.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "mmm:items/food/ingredient/dough"
+    }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/items/food/ingredient/dough.png b/src/resources/assets/mmm/textures/items/food/ingredient/dough.png
new file mode 100644
index 0000000000000000000000000000000000000000..479a70ff85a1288e1d88e8a382ab1e471bc604a6
GIT binary patch
literal 453
zcmV;$0XqJPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004uNkl<ZILoz?
zZ7)J$7{~jJzJz+gi~Af6naoqehAj;nGjGgOC8YJFs7^Yk=Vy_W5At`Na~C>dY+T#*
z^7ntZ?%QDak4XhAkV7+&gVRX)C-5s+h1x|2I;AbN3wAtZmyz^|NL-E}es26;Ob%HI
z-p~Y|^J{2kY<Ngb<6as^JucER#5}|J8ZJ4sZRJ+cROZpRn<CguprFCE7(?ZTA>te$
zl8)H$Qr;%#bu`lpXe1|5PmI06>Q-(U^4AQ$LtT|jWJ!ZNrA@T5D?GLav$s{<OHl^J
zFW}}}#PO~PeFB{_9j$05_eJjh!CBpE*In`o2)jfa?R*eW<E!1(_>an5_h_td%hX*7
zaQC27C!mC9wX5^^R*G-#gL~bRSLE&%5jfQeXrG5Z40oSIjh?I;<FVD=xiG_>Pe9c3
z?*2(Y@{XcTaP`(qkbnX?W<&gF3F;j=dxtF+%h15T5Otf#O@K_0L~&ym+_e|mKPb9>
vyaz@&_f0t2Ga=;Su0MwL)9X60^Iy#?;Q+pGt*#<800000NkvXXu0mjf!%Wlv

literal 0
HcmV?d00001