diff --git a/graphics/wild-tomato.xcf b/graphics/wild-tomato.xcf new file mode 100644 index 0000000..f20db75 Binary files /dev/null and b/graphics/wild-tomato.xcf differ 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 0000000..262de3d Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/plant/wild_tomato/with_fruits.png differ 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 0000000..45168ca Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/plant/wild_tomato/without_fruits.png differ