From ff50b6bf190c10a0e79fd8cd063f648247b2b2f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Mon, 18 Jul 2016 17:27:39 +0200
Subject: [PATCH] Tomato - Started work

The tomatoes and their seeds are done. The plant is textureless and
doesn't work as it should.
---
 graphics/tomato.xcf                           | Bin 0 -> 2271 bytes
 src/java/mmm/MmmPlants.java                   |  23 +++++++
 src/java/mmm/core/CProxyCommon.java           |   2 +
 src/java/mmm/plants/PPlantsHelper.java        |  32 +++++++++
 src/java/mmm/plants/PTomato.java              |  65 ++++++++++++++++++
 src/resources/assets/mmm/lang/en_US.lang      |   4 ++
 .../mmm/models/item/plant/fruit/tomato.json   |   6 ++
 .../mmm/models/item/plant/seeds/tomato.json   |   6 ++
 .../mmm/textures/items/plant/fruit/tomato.png | Bin 0 -> 461 bytes
 .../mmm/textures/items/plant/seeds/tomato.png | Bin 0 -> 140 bytes
 10 files changed, 138 insertions(+)
 create mode 100644 graphics/tomato.xcf
 create mode 100644 src/java/mmm/MmmPlants.java
 create mode 100644 src/java/mmm/plants/PPlantsHelper.java
 create mode 100644 src/java/mmm/plants/PTomato.java
 create mode 100644 src/resources/assets/mmm/models/item/plant/fruit/tomato.json
 create mode 100644 src/resources/assets/mmm/models/item/plant/seeds/tomato.json
 create mode 100644 src/resources/assets/mmm/textures/items/plant/fruit/tomato.png
 create mode 100644 src/resources/assets/mmm/textures/items/plant/seeds/tomato.png

diff --git a/graphics/tomato.xcf b/graphics/tomato.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..914e4d3c8420a3ea13b9c52e49a56e1e2175fb7a
GIT binary patch
literal 2271
zcmcgu-%s0C6uwTd359BzMhnt5DG(sW)U`tr2WKJ4l2NsUm2Og>wn?K9vPd-008)^s
zP{f|PPMXHFy-nKN{)9bNed}ImA5yAHYd7tw(zH%Wvj`=Q_Z?$1Q0Z&0a(%vge%$l<
z_}-)B3)feC<@rV5Vqq!AFue98{3a&H;qexxC;bg$G%<QHJ22nIJZod}I|KiBAia5P
zD;KWM<#TerR9JwD!Ok&pb!}rQ=UZJ~DlCki5*PFH%S+28pJ)lWl)pCTQ_ri`H~|E0
z(<nl(oe=8SeXj--T3%h5n=cgezMzu}%8iqhwoYCz7S?=);`|r6Rf=C;TwKkq9TKGI
zmsJOv<DpasdvIT&gg-JSyz6Kno#In1g_*gHT#1Y>dSD2cRCN>6V`K8{vM~gs>XQ$R
zQ<x6!K7xCW;L}I&8^E-$GdcmBc;}1rjuEupx3R+-zOJjsbuQ~n3C!sCvToMwPl{g9
zYWAlGyhzp9?N2Z^;QfX1thH+<@TM*8`7P#V#;%Fi<!-qw<YD`F))|8i=)u<xx?6V8
z{o4+D_??Z6>JHAEaj%Je2)kM9-riHn@CYlO8Q=d@bybZYcCe>=hbOODjX2I$N*ZyT
z-7ab<?fz_qF`!OnC>4Yon=+!?3hSYVhqZ^GY=;R22x*79*r6_Rh^&YJ$RJjr2oMQ~
zw5=F`lRI#Rhz#}-k--_QkBAIjR{My^V3si;5RtMJkr9cAL_{P?;G^_1AwMCN&;TKe
zoTanUTgZy=6A_7s_=$+0Ud0&l6A?cV;mjV^#A!2$h9y1FxiJw!9|#ZZV1g58BGLbT
zj{mDAoH>dBNqZA(JKj#v#oVTK*62Xe!MCo&m8H4j8lAA$brtCNQ|6Pdf^#)s=4bGr
z;jo2`|J>3X>i88}qrgcKx5`Klpmfg?>4^c<H=)MQ=^BI?A2y>wlQWwDrUvgyiM+Rq
z<Xzd`EHb84%3JF<HzAa*8}iK!g;SbaH<ZXGyk|7>zO0gW_QNTaF)5q46uXdtkS>MA
z50VlmH7|xGHRD31soEW=w2SfPzsxl49|twwn)-}$x2XtxdU;`kUgC9CpK{SSsrv2%
z6Fr4rZS0Um^@S(Lb;94YKFc`uG-eNTt6fYm+s|?CJ!X3s_3AQ>#vObg$o7K+Y1}=K
z_4^0%uZNJGX0!F|aTO8uX8oTR^%u1#)hf1W>^=SC&)<K0R0ZAkUe#UgrF3PaD<fUG
zi#3#}7Sa@j`bS+!PG_f5v1mxdMl~h+$)__@sdQ>GM0c<jp8omE3-NR^mDH%I)U>O&
zKTF5ssnle|vd1n?>k~SbQHAVA<h`gXx*v;2)N|Ha3DFw4#?V&Wtf`ETjp3NIMg!Dw
z8Uaz1q*0hU86U7{CO|U*nhDU9##LF7B<e18DVk1C>Y;IYh-gacm5(x$dQ8`3YBn`F
z^KB^=iB0GeDm9gwI$i!)k3@7`Q>gLO!l}&ocu3cyL5b{!5)Qh8`{4*^S!?M$tyM`H
zLDK<ENgfH{e71)D)Q=kep`qcCVVFSE-^(&6y@1ct!Mf3dUY;GW3GhKj5lola7Vx*_
EKPZUPRsaA1

literal 0
HcmV?d00001

diff --git a/src/java/mmm/MmmPlants.java b/src/java/mmm/MmmPlants.java
new file mode 100644
index 0000000..12bde10
--- /dev/null
+++ b/src/java/mmm/MmmPlants.java
@@ -0,0 +1,23 @@
+package mmm;
+
+
+import mmm.plants.PTomato;
+
+
+
+public class MmmPlants
+{
+
+	public static final PTomato TOMATO;
+
+	static {
+		TOMATO = new PTomato( );
+	}
+
+
+	public static void preInit( )
+	{
+		// EMPTY
+	}
+
+}
diff --git a/src/java/mmm/core/CProxyCommon.java b/src/java/mmm/core/CProxyCommon.java
index ff54c36..5e6945b 100644
--- a/src/java/mmm/core/CProxyCommon.java
+++ b/src/java/mmm/core/CProxyCommon.java
@@ -4,6 +4,7 @@ package mmm.core;
 import mmm.MmmDeco;
 import mmm.MmmFood;
 import mmm.MmmMaterials;
+import mmm.MmmPlants;
 import mmm.MmmTech;
 import mmm.MmmWorld;
 import mmm.recipes.RCraftingWrappers;
@@ -21,6 +22,7 @@ public class CProxyCommon
 		RCraftingWrappers.preInit( );
 		CAccessors.preInit( );
 
+		MmmPlants.preInit( );
 		MmmMaterials.preInit( );
 		MmmWorld.preInit( );
 		MmmTech.preInit( );
diff --git a/src/java/mmm/plants/PPlantsHelper.java b/src/java/mmm/plants/PPlantsHelper.java
new file mode 100644
index 0000000..1cc98b4
--- /dev/null
+++ b/src/java/mmm/plants/PPlantsHelper.java
@@ -0,0 +1,32 @@
+package mmm.plants;
+
+
+import mmm.core.CRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemSeeds;
+
+
+
+public class PPlantsHelper
+{
+
+	public static ItemFood makeFruit( final String name , final int food , final float saturation )
+	{
+		final ItemFood fruit = new ItemFood( food , saturation , false );
+		CRegistry.setIdentifiers( fruit , "plant" , "fruit" , name );
+		CRegistry.addItem( fruit );
+		return fruit;
+	}
+
+
+	public static ItemSeeds makeSeeds( final String name , final Block plant )
+	{
+		final ItemSeeds seeds = new ItemSeeds( plant , Blocks.FARMLAND );
+		CRegistry.setIdentifiers( seeds , "plant" , "seeds" , name );
+		CRegistry.addItem( seeds );
+		return seeds;
+	}
+
+}
diff --git a/src/java/mmm/plants/PTomato.java b/src/java/mmm/plants/PTomato.java
new file mode 100644
index 0000000..3f0781d
--- /dev/null
+++ b/src/java/mmm/plants/PTomato.java
@@ -0,0 +1,65 @@
+package mmm.plants;
+
+
+import mmm.core.CRegistry;
+import mmm.core.api.I_RecipeRegistrar;
+import net.minecraft.block.BlockCrops;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemSeeds;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+
+
+
+public class PTomato
+		implements I_RecipeRegistrar
+{
+
+	public class Plant
+			extends BlockCrops
+	{
+
+		public Plant( )
+		{
+			CRegistry.setIdentifiers( this , "plant" , "block" , "tomato" );
+		}
+
+
+		@Override
+		protected Item getSeed( )
+		{
+			return PTomato.this.SEEDS;
+		}
+
+
+		@Override
+		protected Item getCrop( )
+		{
+			return PTomato.this.FRUIT;
+		}
+
+	}
+
+	public final ItemSeeds SEEDS;
+	public final Plant PLANT;
+	public final ItemFood FRUIT;
+
+
+	public PTomato( )
+	{
+		CRegistry.addBlock( this.PLANT = new Plant( ) , null );
+		this.SEEDS = PPlantsHelper.makeSeeds( "tomato" , this.PLANT );
+		this.FRUIT = PPlantsHelper.makeFruit( "tomato" , 2 , .15f );
+		CRegistry.addRecipeRegistrar( this );
+	}
+
+
+	@Override
+	public void registerRecipes( )
+	{
+		GameRegistry.addShapelessRecipe( new ItemStack( this.SEEDS , 4 ) , //
+				new ItemStack( this.FRUIT ) );
+	}
+
+}
diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index babaa13..b8322ed 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -8,6 +8,10 @@ gui.mmm.tech.base.am.unpowered=Redstone Disables
 gui.mmm.tech.base.am.disabled=Deactivated
 
 
+item.mmm.plant.fruit.tomato.name=Tomato
+item.mmm.plant.seeds.tomato.name=Tomato Seeds
+
+
 tile.mmm.materials.rock.limestone.name=Limestone
 tile.mmm.materials.rock.chalk.name=Chalk
 tile.mmm.materials.rock.slate.name=Slate
diff --git a/src/resources/assets/mmm/models/item/plant/fruit/tomato.json b/src/resources/assets/mmm/models/item/plant/fruit/tomato.json
new file mode 100644
index 0000000..9efd18b
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/plant/fruit/tomato.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "mmm:items/plant/fruit/tomato"
+    }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/plant/seeds/tomato.json b/src/resources/assets/mmm/models/item/plant/seeds/tomato.json
new file mode 100644
index 0000000..777ccea
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/plant/seeds/tomato.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "mmm:items/plant/seeds/tomato"
+    }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/items/plant/fruit/tomato.png b/src/resources/assets/mmm/textures/items/plant/fruit/tomato.png
new file mode 100644
index 0000000000000000000000000000000000000000..688996d36e33ef83cdbff674ba4ea99378d7e925
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004$Nkl<ZILn=p
zOG^S_6o%&~w5w&7m&r?xj*gC*ik6t#6<Sq)AxIDml#p75Z8B=zuAk5{+O?_{T?o3-
zDhLWvT6B3k-)F|;WReG72IidS`OY^Z2!B-9cn><1P6+K3gTuu%#EjCOgbAX{V=&B1
z{}UVv0vH@BrbsXfe}4E|vP->|Fq~EnOSuq&OCzvn15gWbDESy39U@knNg83KqFi8F
z@BjfBzQPb(i(xL%N$N0s5->9X%uWL77zq+JK{NnFRKCTF?7*I}8(FP{3p@@W83T6K
zft3spj{re$4G#OcfIUAH3CEURtmy>Qz;qHQ<$$><0@a#;g~2R?3f{d=>>CZp=>!2<
zH4&+8p}GM-MU^$MkFMxKm9Bb38<cbcGGoBQhkk^K*%quX+3;W&aY}*>oq&BrxnD0}
zSEJq=<=$q-g=oYH3CfLs;(%Vf(oogyz!MEtY!<$5h4M_f>N9chS6C}Kqk(HW<(6`1
zHQ~l;#wEe$%}#EtO&Zvy)K9Bti{7<_wN?HC$}PZ8(i~2HLIvD%00000NkvXXu0mjf
D3KG9^

literal 0
HcmV?d00001

diff --git a/src/resources/assets/mmm/textures/items/plant/seeds/tomato.png b/src/resources/assets/mmm/textures/items/plant/seeds/tomato.png
new file mode 100644
index 0000000000000000000000000000000000000000..b17f2e98ecfacf13a48d67c943aea92ce282baae
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`!JaOTAr_~T6D0mUIN9{-ze={l
zwUV_)AMAbp9Gnt!sIAfDfXTw{_!DLS{O$iMSxerHu9(|@_T-K|uGaYq?PeYIyKU!H
o+`i~6eZ*ce``i3Pkq0ac8JWJJPi42o1C3|!boFyt=akR{05|nDfB*mh

literal 0
HcmV?d00001