Tomato appearance

TODO.txt

@@ -5,7 +5,6 @@ deco			No		Copper pots
 deco			No		Copper plates
 deco			No		Lanterns
 -------------------------------------------------------------------------------------------------------
-plants			No?		Tomatoes
 plants			No?		Turnips
 plants			No?		Cabbages
 plants			No?		Zucchinis

src/java/mmm/plants/PTomato.java

@@ -220,7 +220,7 @@ public class PTomato
 		{
 			final int age = this.getAge( state );
 			final int size = ( age & 7 ) >> 1;
-			final boolean highest = age < 15 || worldIn.getBlockState( pos.up( ) ).getBlock( ) != this;
+			final boolean highest = age < 7 || worldIn.getBlockState( pos.up( ) ).getBlock( ) != this;
 			final boolean withFruits = ( age & 8 ) != 0;
 			return state.withProperty( PTomato.SIZE , size ) //
 					.withProperty( PTomato.HIGHEST , highest ) //
@@ -372,6 +372,7 @@ public class PTomato
 				}
 				if ( this.getAge( s ) != 15 ) {
 					this.grow( worldIn , bPos , s , MathHelper.getRandomIntegerInRange( worldIn.rand , 2 , 5 ) );
+					this.grow( worldIn , bPos , s , 1 );
 				}
 			}
 		}
@@ -381,7 +382,7 @@ public class PTomato
 		{
 			final int newAge = Math.min( 15 , this.getAge( state ) + increase );
 			worldIn.setBlockState( pos , this.withAge( newAge ) , 2 );
-			if ( newAge > 7 && !this.isHighestBlock( worldIn , pos )
+			if ( newAge > 6 && !this.isHighestBlock( worldIn , pos )
 					&& worldIn.getBlockState( pos.up( ) ).getMaterial( ) == Material.AIR ) {
 				worldIn.setBlockState( pos.up( ) , this.getDefaultState( ) );
 			}

src/resources/assets/mmm/blockstates/plant/block/tomato.json

@@ -0,0 +1,27 @@
+{
+    "variants": {
+        "fruits=false,highest=true,size=0":  { "model": "mmm:plant/tomato/s0" },
+        "fruits=false,highest=false,size=0":  { "model": "mmm:plant/tomato/s0" },
+
+        "fruits=false,highest=true,size=1":  { "model": "mmm:plant/tomato/s1" },
+        "fruits=false,highest=false,size=1":  { "model": "mmm:plant/tomato/s1" },
+
+        "fruits=false,highest=true,size=2":  { "model": "mmm:plant/tomato/s2" },
+        "fruits=false,highest=false,size=2":  { "model": "mmm:plant/tomato/s2" },
+
+        "fruits=false,highest=true,size=3":  { "model": "mmm:plant/tomato/s3h" },
+        "fruits=false,highest=false,size=3":  { "model": "mmm:plant/tomato/s3c" },
+
+        "fruits=true,highest=true,size=0":  { "model": "mmm:plant/tomato/f0h" },
+        "fruits=true,highest=false,size=0":  { "model": "mmm:plant/tomato/f0c" },
+
+        "fruits=true,highest=true,size=1":  { "model": "mmm:plant/tomato/f1h" },
+        "fruits=true,highest=false,size=1":  { "model": "mmm:plant/tomato/f1c" },
+
+        "fruits=true,highest=true,size=2":  { "model": "mmm:plant/tomato/f2h" },
+        "fruits=true,highest=false,size=2":  { "model": "mmm:plant/tomato/f2c" },
+
+        "fruits=true,highest=true,size=3":  { "model": "mmm:plant/tomato/f3h" },
+        "fruits=true,highest=false,size=3":  { "model": "mmm:plant/tomato/f3c" }
+    }
+}

src/resources/assets/mmm/models/block/plant.json

@@ -0,0 +1,24 @@
+{
+    "ambientocclusion": false,
+    "textures": {
+        "particle": "#plant"
+    },
+    "elements": [
+        {   "from": [ 0, -1, 8 ],
+            "to": [ 16, 15, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" },
+                "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#plant" }
+            }
+        },
+        {   "from": [ 8, -1, 0 ],
+            "to": [ 8, 15, 16 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" },
+                "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#plant" }
+            }
+        }
+    ]
+}

src/resources/assets/mmm/models/block/plant/tomato/f0c.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/f0c"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/f0h.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/f0h"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/f1c.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/f1c"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/f1h.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/f1h"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/f2c.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/f2c"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/f2h.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/f2h"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/f3c.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/f3c"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/f3h.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/f3h"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/s0.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/s0"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/s1.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/s1"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/s2.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/s2"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/s3c.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/s3c"
+    }
+}

src/resources/assets/mmm/models/block/plant/tomato/s3h.json

@@ -0,0 +1,6 @@
+{
+    "parent": "mmm:block/plant" ,
+    "textures": {
+        "plant": "mmm:blocks/plant/tomato/s3h"
+    }
+}