diff --git a/src/java/mmm/materials/MTrees.java b/src/java/mmm/materials/MTrees.java index 1266ed8..7fbfda4 100644 --- a/src/java/mmm/materials/MTrees.java +++ b/src/java/mmm/materials/MTrees.java @@ -2,9 +2,9 @@ package mmm.materials; import mmm.utils.UMaths; -import mmm.world.trees.WTBambooGenerator; -import mmm.world.trees.WTBigHeveaGenerator; -import mmm.world.trees.WTHeveaGenerator; +import mmm.world.trees.WTBamboo; +import mmm.world.trees.WTHeveaBig; +import mmm.world.trees.WTHevea; import net.minecraft.block.material.MapColor; @@ -21,16 +21,16 @@ public class MTrees this.HEVEA = new MTree( "hevea" ) // .setBarkColor( MapColor.GRAY ) // .setBaseFireInfo( 5 , 8 ) // - .setTreeGenerator( WTHeveaGenerator.createSaplingGen( ) ) // - .setBigTreeGenerator( WTBigHeveaGenerator.createSaplingGen( ) , .05f ) // + .setTreeGenerator( WTHevea.createSaplingGen( ) ) // + .setBigTreeGenerator( WTHeveaBig.createSaplingGen( ) , .05f ) // .register( ); this.BAMBOO = new MTree( "bamboo" ) // .setBarkColor( MapColor.FOLIAGE ) // .setLogBoundingBox( UMaths.makeBlockAABB( 4 , 0 , 4 , 12 , 16 , 12 ) ) // .setGrowthChance( .3f ) // - .setTreeGenerator( WTBambooGenerator.createSaplingGen( false ) ) // - .setBigTreeGenerator( WTBambooGenerator.createSaplingGen( true ) , .15f ) // + .setTreeGenerator( WTBamboo.createSaplingGen( false ) ) // + .setBigTreeGenerator( WTBamboo.createSaplingGen( true ) , .15f ) // .register( ); } } diff --git a/src/java/mmm/world/biome/WBBambooForest.java b/src/java/mmm/world/biome/WBBambooForest.java index 3f71ec5..a9fc93a 100644 --- a/src/java/mmm/world/biome/WBBambooForest.java +++ b/src/java/mmm/world/biome/WBBambooForest.java @@ -7,7 +7,7 @@ import mmm.materials.Materials; import mmm.world.WBiomeHelper; import mmm.world.gen.WGBambooPatch; import mmm.world.trees.A_WTTreeGenerator; -import mmm.world.trees.WTBambooGenerator; +import mmm.world.trees.WTBamboo; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockTallGrass; @@ -27,8 +27,8 @@ import net.minecraft.world.gen.feature.WorldGenerator; public class WBBambooForest extends Biome { - private static final A_WTTreeGenerator TG_BAMBOO_BIG = new WTBambooGenerator( true , false ); - private static final A_WTTreeGenerator TG_BAMBOO = new WTBambooGenerator( false , false ); + private static final A_WTTreeGenerator TG_BAMBOO_BIG = new WTBamboo( true , false ); + private static final A_WTTreeGenerator TG_BAMBOO = new WTBamboo( false , false ); private static final WorldGenShrub TG_SHRUB = new WorldGenShrub( // Materials.TREE.BAMBOO.LOG.getDefaultState( ) , // Materials.TREE.BAMBOO.LEAVES.getDefaultState( ).withProperty( BlockLeaves.CHECK_DECAY , false ) ); diff --git a/src/java/mmm/world/biome/WBTropicalSwamp.java b/src/java/mmm/world/biome/WBTropicalSwamp.java index b7e1322..5515e07 100644 --- a/src/java/mmm/world/biome/WBTropicalSwamp.java +++ b/src/java/mmm/world/biome/WBTropicalSwamp.java @@ -9,8 +9,8 @@ import mmm.world.WBiomeHelper; import mmm.world.gen.WGBambooPatch; import mmm.world.gen.WGOreParameters; import mmm.world.trees.A_WTTreeGenerator; -import mmm.world.trees.WTBambooGenerator; -import mmm.world.trees.WTHeveaGenerator; +import mmm.world.trees.WTBamboo; +import mmm.world.trees.WTHevea; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockOldLeaf; @@ -47,9 +47,9 @@ public class WBTropicalSwamp private static final IBlockState WATER_LILY = Blocks.WATERLILY.getDefaultState( ); - private static final A_WTTreeGenerator TG_BAMBOO_BIG = new WTBambooGenerator( true , false ); - private static final A_WTTreeGenerator TG_BAMBOO = new WTBambooGenerator( false , false ); - private static final A_WTTreeGenerator TG_HEVEA = new WTHeveaGenerator( false ); + private static final A_WTTreeGenerator TG_BAMBOO_BIG = new WTBamboo( true , false ); + private static final A_WTTreeGenerator TG_BAMBOO = new WTBamboo( false , false ); + private static final A_WTTreeGenerator TG_HEVEA = new WTHevea( false ); private static final WorldGenShrub TG_SHRUB = new WorldGenShrub( // WBTropicalSwamp.OAK_LOG , WBTropicalSwamp.OAK_LEAF ); diff --git a/src/java/mmm/world/gen/WGBambooPatch.java b/src/java/mmm/world/gen/WGBambooPatch.java index 95b1b60..5fade71 100644 --- a/src/java/mmm/world/gen/WGBambooPatch.java +++ b/src/java/mmm/world/gen/WGBambooPatch.java @@ -8,7 +8,7 @@ import com.google.common.collect.Lists; import mmm.materials.Materials; import mmm.world.trees.A_WTTreeGenerator; -import mmm.world.trees.WTBambooGenerator; +import mmm.world.trees.WTBamboo; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; @@ -22,8 +22,8 @@ import net.minecraft.world.gen.feature.WorldGenerator; public class WGBambooPatch extends WorldGenerator { - private static final A_WTTreeGenerator TG_BAMBOO_BIG = new WTBambooGenerator( true , false ); - private static final A_WTTreeGenerator TG_BAMBOO = new WTBambooGenerator( false , false ); + private static final A_WTTreeGenerator TG_BAMBOO_BIG = new WTBamboo( true , false ); + private static final A_WTTreeGenerator TG_BAMBOO = new WTBamboo( false , false ); private static final IBlockState BS_WATER = Blocks.WATER.getDefaultState( ); diff --git a/src/java/mmm/world/trees/WTBambooGenerator.java b/src/java/mmm/world/trees/WTBamboo.java similarity index 85% rename from src/java/mmm/world/trees/WTBambooGenerator.java rename to src/java/mmm/world/trees/WTBamboo.java index 300f712..32ce6bc 100644 --- a/src/java/mmm/world/trees/WTBambooGenerator.java +++ b/src/java/mmm/world/trees/WTBamboo.java @@ -11,12 +11,12 @@ import net.minecraft.util.math.BlockPos; -public class WTBambooGenerator +public class WTBamboo extends A_WTTreeGenerator { - public static WTBambooGenerator createSaplingGen( final boolean big ) + public static WTBamboo createSaplingGen( final boolean big ) { - return new WTBambooGenerator( big , true , null ); + return new WTBamboo( big , true , null ); } private final int minHeight; @@ -24,13 +24,13 @@ public class WTBambooGenerator private final int maxRingRadius; - public WTBambooGenerator( final boolean big , final boolean notify ) + public WTBamboo( final boolean big , final boolean notify ) { this( big , notify , Materials.TREE.BAMBOO ); } - private WTBambooGenerator( final boolean big , final boolean notify , MTree materials ) + private WTBamboo( final boolean big , final boolean notify , MTree materials ) { super( notify , materials ); this.minHeight = big ? 13 : 5; diff --git a/src/java/mmm/world/trees/WTHeveaGenerator.java b/src/java/mmm/world/trees/WTHevea.java similarity index 93% rename from src/java/mmm/world/trees/WTHeveaGenerator.java rename to src/java/mmm/world/trees/WTHevea.java index a7a34f6..c4af913 100644 --- a/src/java/mmm/world/trees/WTHeveaGenerator.java +++ b/src/java/mmm/world/trees/WTHevea.java @@ -10,24 +10,24 @@ import net.minecraft.util.math.BlockPos; -public class WTHeveaGenerator +public class WTHevea extends A_WTTreeGenerator { - public static WTHeveaGenerator createSaplingGen( ) + public static WTHevea createSaplingGen( ) { - return new WTHeveaGenerator( ); + return new WTHevea( ); } - public WTHeveaGenerator( final boolean notify ) + public WTHevea( final boolean notify ) { super( notify , Materials.TREE.HEVEA ); } // Used for sapling gen - protected WTHeveaGenerator( ) + protected WTHevea( ) { super( true , null ); } diff --git a/src/java/mmm/world/trees/WTBigHeveaGenerator.java b/src/java/mmm/world/trees/WTHeveaBig.java similarity index 93% rename from src/java/mmm/world/trees/WTBigHeveaGenerator.java rename to src/java/mmm/world/trees/WTHeveaBig.java index 222b7e7..317f66a 100644 --- a/src/java/mmm/world/trees/WTBigHeveaGenerator.java +++ b/src/java/mmm/world/trees/WTHeveaBig.java @@ -10,24 +10,24 @@ import net.minecraft.util.math.BlockPos; -public class WTBigHeveaGenerator - extends WTHeveaGenerator +public class WTHeveaBig + extends WTHevea { - public static WTBigHeveaGenerator createSaplingGen( ) + public static WTHeveaBig createSaplingGen( ) { - return new WTBigHeveaGenerator( ); + return new WTHeveaBig( ); } - public WTBigHeveaGenerator( final boolean notify ) + public WTHeveaBig( final boolean notify ) { super( notify ); } // Used for sapling gen - protected WTBigHeveaGenerator( ) + protected WTHeveaBig( ) { super( ); }