From 007dd0d819973bf5492204e143742ea8475678e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Wed, 20 Jul 2016 11:55:45 +0200
Subject: [PATCH] Tomato - Wild tomato appearance

Also reduced chance of wild tomato making fruits
---
 graphics/wild-tomato.xcf                         | Bin 0 -> 1817 bytes
 src/java/mmm/plants/PTomato.java                 |   8 ++++----
 .../mmm/blockstates/plant/block/wild_tomato.json |  13 +++++++++++++
 .../mmm/models/item/plant/block/wild_tomato.json |   6 ++++++
 .../blocks/plant/wild_tomato/with_fruits.png     | Bin 0 -> 268 bytes
 .../blocks/plant/wild_tomato/without_fruits.png  | Bin 0 -> 255 bytes
 6 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 graphics/wild-tomato.xcf
 create mode 100644 src/resources/assets/mmm/blockstates/plant/block/wild_tomato.json
 create mode 100644 src/resources/assets/mmm/models/item/plant/block/wild_tomato.json
 create mode 100644 src/resources/assets/mmm/textures/blocks/plant/wild_tomato/with_fruits.png
 create mode 100644 src/resources/assets/mmm/textures/blocks/plant/wild_tomato/without_fruits.png

diff --git a/graphics/wild-tomato.xcf b/graphics/wild-tomato.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..f20db7579318f85532192a727d97b22da4774d25
GIT binary patch
literal 1817
zcmcgsOHUI~6h1RUOL+wpH8F9~#D!pjp_Ca7FX@9Wc&LdRS0<&jb&}FzTOzDn5u@cz
zaG?oNQ5OC!e?m1{pdG(&I%7&K(G@py&iU?n-0#l0GdFE6F8NmyDSyh$Bn6|#5#mb_
zMS<#t_`=&F6pSm77RXJ=H3u{AD)Mi@_N1}wfVmh?CkN7ba{(?vT#>#)aW#|l7jhYM
zp})N^l}_X`xxBy6HUs(eeB3{HXV4x^K)?z0qjbJWsT=p74_LZVSc)giY}y}ix!_!F
z=5%}m%UQGNH?xUn$pY(hsZ=3Z{Ifw;|Lv-K&X%$d&QMAsS`ck~?s{O|=ChZrvHY@G
zEHLVYu-z8K=U^CVYrt$fb2!=|F79Z+oej9F0e1s)U3atsxb^N)d)%OiI^tk=yU0}^
zob{<sIe#hdM6onS6xfPb79UM&7C4}~;XS3xo~iDPMZNX{)hC9)ZD>+9CPgqa@Wi-;
z!J-(KFiz>kjJd}~NbXG{p=ylDWqXm@ZRrxI$C$k*Es4mX$}f9E|Gy`^m;2&8Ctoa+
zdy&kadr-`|$b)hZ4z$`gC=PeOh-p9TF4xz>!$wm+vMFs;tyK15^bpzV`u}9$P5-@4
z!*19a@1smSTjUm0DvV|y`$hLqt8azcbIZXEJ@ky8^?7DEFG_V}R60Zn)^vV*qZ7FB
zPR0!xhOLZ@iwuw8Ex!-z`Y^B#L7OW>giNUh1JLEMaoh^JZb)z_fMv>t2=HA5N5{k?
zCq_`$nH|t^QcBQE-h)H(Zq#<kd-xUMlcRmvf~_1JiEMr#@8-_VCh#tVyl-S{2M8;b
z)}YIuk2XZMxA&y<`W1QiMfPR=ErOrEkaur=cZb<)+u*I1*5L#5^emafwJ4cqA0pvo
zE+!G!%JiH_WQNR<Xfy&Gg^+oYkSWy=TcphW2qO}ilF;ORGRH(>5{@A_J4fcJa5T#7
zi3piPVVha8Iz_cw>_1qss<<0@y-+mKY^&72<4XPaw!<n)6i7`h1+~YxP!Uz@_m2m4
KycK*9ulxqq?NSZ^

literal 0
HcmV?d00001

diff --git a/src/java/mmm/plants/PTomato.java b/src/java/mmm/plants/PTomato.java
index 0a318d5..ee9a501 100644
--- a/src/java/mmm/plants/PTomato.java
+++ b/src/java/mmm/plants/PTomato.java
@@ -47,9 +47,9 @@ public class PTomato
 	public static final PropertyBool HIGHEST = PropertyBool.create( "highest" );
 	public static final PropertyBool WITH_FRUITS = PropertyBool.create( "fruits" );
 	private static final AxisAlignedBB[] PLANT_AABB = new AxisAlignedBB[] {
-			UMaths.makeBlockAABB( 0 , 0 , 0 , 16 , 4 , 0 ) , //
-			UMaths.makeBlockAABB( 0 , 0 , 0 , 16 , 8 , 0 ) , //
-			UMaths.makeBlockAABB( 0 , 0 , 0 , 16 , 12 , 0 ) , //
+			UMaths.makeBlockAABB( 0 , 0 , 0 , 16 , 4 , 16 ) , //
+			UMaths.makeBlockAABB( 0 , 0 , 0 , 16 , 8 , 16 ) , //
+			UMaths.makeBlockAABB( 0 , 0 , 0 , 16 , 12 , 16 ) , //
 			Block.FULL_BLOCK_AABB
 	};
 
@@ -145,7 +145,7 @@ public class PTomato
 		{
 			super.updateTick( worldIn , pos , state , rand );
 			if ( state.getValue( PTomato.WITH_FRUITS ) || worldIn.getLightFromNeighbors( pos.up( ) ) < 10
-					|| rand.nextInt( 100 ) != 0 ) {
+					|| rand.nextInt( 500 ) != 0 ) {
 				return;
 			}
 			this.grow( worldIn , rand , pos , state );
diff --git a/src/resources/assets/mmm/blockstates/plant/block/wild_tomato.json b/src/resources/assets/mmm/blockstates/plant/block/wild_tomato.json
new file mode 100644
index 0000000..cceb936
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/plant/block/wild_tomato.json
@@ -0,0 +1,13 @@
+{
+	"forge_marker": 1 ,
+	"defaults" : {
+		"model": "minecraft:cross"
+	} ,
+	"variants" : {
+		"fruits" : {
+			"true" : { "textures" : { "cross" : "mmm:blocks/plant/wild_tomato/with_fruits" } } ,
+			"false" : { "textures" : { "cross" : "mmm:blocks/plant/wild_tomato/without_fruits" } }
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/plant/block/wild_tomato.json b/src/resources/assets/mmm/models/item/plant/block/wild_tomato.json
new file mode 100644
index 0000000..2a1d495
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/plant/block/wild_tomato.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "mmm:blocks/plant/wild_tomato/without_fruits"
+    }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/blocks/plant/wild_tomato/with_fruits.png b/src/resources/assets/mmm/textures/blocks/plant/wild_tomato/with_fruits.png
new file mode 100644
index 0000000000000000000000000000000000000000..262de3d908226bc279791481f4bb52cb24ad5111
GIT binary patch
literal 268
zcmV+n0rUQeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002fNkl<ZILqx(
z%MOA-4BTG=0SzGXl7mA0Dr0=VqDNzV9sJ3<v#^U0V~j^*lP0C@OlKCx{_(3}AA01R
zQ~C<rn1_TkH}OjX5PSDQb=JORWbG2sG?o$7)nJaAEJns6BKz1cchHmra~+FBE&6`Z
zFVx6Ai75$^{6nAkN(G1{pki?vkT&!bMudCGgiLssJ#)oLcv{;oNuWOVNgH*l{-qqe
z!E-G@vyhtmgw$0&b51F_*R1viK`w_{xo=zr7~Ww;?YT@4LD^@&lwStXyPXHp*qwyM
SGP^_o0000<MNUMnLSTZ2N^%(h

literal 0
HcmV?d00001

diff --git a/src/resources/assets/mmm/textures/blocks/plant/wild_tomato/without_fruits.png b/src/resources/assets/mmm/textures/blocks/plant/wild_tomato/without_fruits.png
new file mode 100644
index 0000000000000000000000000000000000000000..45168ca2aaca5bd098a49fe2f7b5b6ec7b0a25b7
GIT binary patch
literal 255
zcmV<b0094qP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002SNkl<ZILqyk
z*$Toy3`P4(U4>d}ZEGL2#jg@^-_S=9w+DanI(J~CqgBL5F%X!UOipeR!}!~;n!oFy
ze$4SzvOSGKcUNg8fZ*`j(_@WG0dJGZM`xbkQ4Qnj?#vSS`>qZE3^3p>Q|UaH6Uu6M
z=l@Fi)+oBGAV`6=7RN1^{ZNMlr$WkP@9NE62#9cR-G)lEh7rs`^SL@{Y6diQwkI)a
z+YG9z9O5BIa4ueNNWw%_CbM_8QjQZuWuL87R3_-%pBrNwe1EwGR?z?e002ovPDHLk
FV1l4KZ8HD>

literal 0
HcmV?d00001