From e4ccf0a1a22ba9d79eb6f95de879eb5a3f0f2bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Fri, 22 Jul 2016 08:31:13 +0200
Subject: [PATCH] Apple pie!

---
 TODO.txt                                      |   1 -
 graphics/pie.xcf                              | Bin 0 -> 2676 bytes
 src/java/mmm/food/FMeals.java                 |  23 +++++++++++++++++-
 src/resources/assets/mmm/lang/en_US.lang      |   2 ++
 .../mmm/models/item/food/meal/pie/apple.json  |   6 +++++
 .../textures/items/food/meal/pie/apple.png    | Bin 0 -> 335 bytes
 6 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 graphics/pie.xcf
 create mode 100644 src/resources/assets/mmm/models/item/food/meal/pie/apple.json
 create mode 100644 src/resources/assets/mmm/textures/items/food/meal/pie/apple.png

diff --git a/TODO.txt b/TODO.txt
index 6a2e786..f20dcf1 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -18,7 +18,6 @@ food			???		Milk processing
 							Butter
 							Cheesemaking
 food			No		Extra recipes
-							Apple pie
 							Ratatouille
 							Pasta w/tomato
 							Beef stew
diff --git a/graphics/pie.xcf b/graphics/pie.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..cfdf1d20662b57a29dc19aa978b2ee00deb613ce
GIT binary patch
literal 2676
zcmd5;O-N%`6h8MQF)?G?DgBW^7eNZug=Gc=8JI5G;-U<~6uNRDO)^P*l0VGTWTp@o
zv&bw)(je0!PAd&`$|y{_NH(@mLuVl<xT#o_mNIQe$Zkf9F+cb9J1_5zm8M-4=?UlE
z@1A?^{jTSnd#_<Nn((FrA#X^H1POB9RK_ntg}~<}sOz1NiC7^oL+#KW=&L4XzgOV@
z8rt(=EIX)1ec|9>cuKtn6JcCXe^R?133`+9h<a_n-5&}E;*t22x8G<6r^0@p_rjYO
z4Cw$annMGa>hCbs8u$J);Hl|k!WU3uVedtY3&!i6jHYdHI;Lt~H5Ql%CV7556iNoQ
zXB*_%e>b%)r>AlpOcC=$w%>>x&k=R~itsAd2wE!%9Mk9DP9zXAEuKhV&+KG*b^&u1
zbg0Y3JfqvhXo$1HJ}hpih0py3a~3T-cJmCs0L<%J;smh#tP0>YO;O%Afwg=1Dn?Dg
zZrYS-_IZP(#L7o4`r&9#?$xM^{y5sJ)qavYwOvUzdRlvQ^r-fWJdkn+u7VDJugS;w
z{VaFoE&_1)SRQUYU6)4JMu%I6TkGp`7n6Cq*lMg3P>7k9nW;#*d-Kcl_n2vU{;QRR
z;+>WGA~UVrUB3JEQfZ}Fyi+VP(-+0c1N=TKEtVFU=|N>7JvUh~x?oB#q$ejUi;E>H
zF;luRNmOYwC73Bi<56G27h|TRFQ$cOf|@S{*P1q&oct)BNr_Z5m`X8K{6_vJe$h-M
z6Je^G`SFpf!+E0%s*&-L;o*EFlA#P!jWmXd@@*;|R4tu!yY8fJ-A+BaLg#cFxq)4J
z3ngJAMHeJ>_(M2#HYk^e``u~Ho1E|^jNF`65pmHnSEnN4f;Gkdi3zM7qloOwr)~CC
z?u+e%!u|V&!k2}Ojn&n{hS(6RvatQcA2rQmW22*mF)=1aWg+@x;F4+X>+9_;^oc&v
zD+`wdbs=hqlJUW+R_z)m?}PT4JNsane{aWNaS%;$d~X74*9ewl=d{hS&;21f)@Jkh
z>@0H7x{=L`eEpWu<+{w~Z{-)**21_#t=TNXQJ>A`vl{LaHXChLYLxt+uH-P!0iOYZ
zGho-<WP>WY#(zG?%qst$_hPZ&)W7GH=ls{VC?5bW>P`p1!Gvvberf`1&&a8B<+RQD
z4fl_$`!h2W6Ek8)OdK=J<@S$1zkOn3==a|~{&4)n#?a##7q}%P=>pdV#3~=-cDSnI
zeLm~kfp@{uDL9-sQ(PqzSUW~=T)65DF>S6Nx%WCbq?3enK<(}4#&}5ZaZ^L`>(Fki
zNOWCRiK-wMvR>Wh`&^L7*`%npzRNMLG;?rJs?BZm;Z|(`<ZuVuazmgJYvNn62KyT5
z)<Cz0A^8w9@d3?4qIGVu(=yX-mKnf*vtC{znqvyTZBvw6bAHBiO+Orza&rlNxRo0K
zex~yqbgJ+R6?PSLD(F<EOE6u6X%a*!Zc{`7rpp8vz&}$DTp_y56dqef1X^!-7+-FB
z;GhJWSI~!BpaI}vIuFzF*%CUaaISDuf=Xv9ohk6I$4QI3qW$DJarO)kfyYTP9-=PY
Lg@w8?FhqX>cs^B6

literal 0
HcmV?d00001

diff --git a/src/java/mmm/food/FMeals.java b/src/java/mmm/food/FMeals.java
index 5cd25dd..3b6dde9 100644
--- a/src/java/mmm/food/FMeals.java
+++ b/src/java/mmm/food/FMeals.java
@@ -3,28 +3,49 @@ package mmm.food;
 
 import mmm.MmmFood;
 import mmm.MmmPlants;
+import mmm.core.CRegistry;
+import mmm.core.api.I_RecipeRegistrar;
 import net.minecraft.init.Items;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 
 
 
 public class FMeals
+		implements I_RecipeRegistrar
 {
 
 	public final FSausage SAUSAGE;
 	public final FCookableMeal PASTA;
+
 	public final FMealInBowl TOMATO_SOUP;
 	public final FMealInBowl GLOWING_SOUP;
 
+	public final ItemFood APPLE_PIE;
+
 
 	public FMeals( )
 	{
+		CRegistry.addRegistrar( this );
+
 		this.SAUSAGE = new FSausage( );
 		this.PASTA = new FCookableMeal( "pasta" , 2 , 0.7f , 0.5f , false , 1 , //
 				Items.EGG , MmmFood.INGREDIENT.FLOUR );
+
 		this.TOMATO_SOUP = new FMealInBowl( "tomato_soup" , 8 , 1.1f , //
 				"TTT" , " B " , 'T' , MmmPlants.TOMATO.FRUIT );
-
 		this.GLOWING_SOUP = new FGlowingSoup( );
+
+		this.APPLE_PIE = FHelpers.makeBasicMeal( 8 , 0.5f , false , "pie" , "apple" );
+	}
+
+
+	@Override
+	public void registerRecipes( )
+	{
+		GameRegistry.addShapelessRecipe( new ItemStack( this.APPLE_PIE ) , //
+				MmmFood.INGREDIENT.DOUGH , Items.SUGAR , Items.APPLE );
 	}
 
 }
diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index 04f798b..4a051dd 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -167,6 +167,8 @@ item.mmm.food.meal.pasta.cooked.name=Pasta
 item.mmm.food.meal.tomato_soup.name=Tomato Soup
 item.mmm.food.meal.glowing_soup.name=Glowing Soup
 
+item.mmm.food.meal.pie.apple.name=Apple Pie
+
 
 tile.mmm.deco.smoothstone.limestone.name=Polished Limestone
 tile.mmm.deco.smoothstone.basalt.name=Polished Basalt
diff --git a/src/resources/assets/mmm/models/item/food/meal/pie/apple.json b/src/resources/assets/mmm/models/item/food/meal/pie/apple.json
new file mode 100644
index 0000000..b29bdf1
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/food/meal/pie/apple.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "mmm:items/food/meal/pie/apple"
+    }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/items/food/meal/pie/apple.png b/src/resources/assets/mmm/textures/items/food/meal/pie/apple.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc0d7f2b824974f31a72d885fca1f7d864c99fdc
GIT binary patch
literal 335
zcmV-V0kHmwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003NNkl<ZILl*T
z7?j}Ofz1D4yeH}Zzf}eQVSIub|E@0wE4<Pl_y7B{-2b;HCxQ(C(La{u;Wr2*@qJY>
zMDg;x|36lj{J%Rh{r|u9W&f{FO$GCBfeZv$a-;y&5Rd>!!J|1@U_(Ikj}6uTAI#7H
z|8Gm(|Ie$-AsT@gWEhN%FyKV_|ECM{|NmHD_5a_&iT|IiYeu2(&CLZHbZd4Ff<A#{
zz^kpvaK&F{#{EBE;rjnmZ@~W(S>|9d49#ci{)6<O7y!})(+tuG(+tu8(+tuGqCx7f
z&i6(baIn_~tP!TUKS>gd!M2~NgJY0J5Z>Qw3zkO-NRS~Qj4T1u0K*_#v1-NzuxTV(
hGYG&mkgRcN0RTi)RcX%Z`=9^-002ovPDHLkV1oQ6n-Bm1

literal 0
HcmV?d00001