projects/mmm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tree generators renamed

Browse source
This commit is contained in:
Emmanuel BENOîT 2016-07-11 14:27:45 +02:00
parent 085707ee58
commit 9b3f4b7c0c
7 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/java/mmm/materials/MTrees.java
View file

@ -2,9 +2,9 @@ package mmm.materials;
import mmm.utils.UMaths; import mmm.utils.UMaths;
import mmm.world.trees.WTBambooGenerator; import mmm.world.trees.WTBamboo;
import mmm.world.trees.WTBigHeveaGenerator; import mmm.world.trees.WTHeveaBig;
import mmm.world.trees.WTHeveaGenerator; import mmm.world.trees.WTHevea;
import net.minecraft.block.material.MapColor; import net.minecraft.block.material.MapColor;
@ -21,16 +21,16 @@ public class MTrees
this.HEVEA = new MTree( "hevea" ) // this.HEVEA = new MTree( "hevea" ) //
.setBarkColor( MapColor.GRAY ) // .setBarkColor( MapColor.GRAY ) //
.setBaseFireInfo( 5 , 8 ) // .setBaseFireInfo( 5 , 8 ) //
.setTreeGenerator( WTHeveaGenerator.createSaplingGen( ) ) // .setTreeGenerator( WTHevea.createSaplingGen( ) ) //
.setBigTreeGenerator( WTBigHeveaGenerator.createSaplingGen( ) , .05f ) // .setBigTreeGenerator( WTHeveaBig.createSaplingGen( ) , .05f ) //
.register( ); .register( );
this.BAMBOO = new MTree( "bamboo" ) // this.BAMBOO = new MTree( "bamboo" ) //
.setBarkColor( MapColor.FOLIAGE ) // .setBarkColor( MapColor.FOLIAGE ) //
.setLogBoundingBox( UMaths.makeBlockAABB( 4 , 0 , 4 , 12 , 16 , 12 ) ) // .setLogBoundingBox( UMaths.makeBlockAABB( 4 , 0 , 4 , 12 , 16 , 12 ) ) //
.setGrowthChance( .3f ) // .setGrowthChance( .3f ) //
.setTreeGenerator( WTBambooGenerator.createSaplingGen( false ) ) // .setTreeGenerator( WTBamboo.createSaplingGen( false ) ) //
.setBigTreeGenerator( WTBambooGenerator.createSaplingGen( true ) , .15f ) // .setBigTreeGenerator( WTBamboo.createSaplingGen( true ) , .15f ) //
.register( ); .register( );
} }
} }

6
src/java/mmm/world/biome/WBBambooForest.java
View file

@ -7,7 +7,7 @@ import mmm.materials.Materials;
import mmm.world.WBiomeHelper; import mmm.world.WBiomeHelper;
import mmm.world.gen.WGBambooPatch; import mmm.world.gen.WGBambooPatch;
import mmm.world.trees.A_WTTreeGenerator; 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.BlockFlower;
import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockLeaves;
import net.minecraft.block.BlockTallGrass; import net.minecraft.block.BlockTallGrass;
@ -27,8 +27,8 @@ import net.minecraft.world.gen.feature.WorldGenerator;
public class WBBambooForest public class WBBambooForest
extends Biome extends Biome
{ {
private static final A_WTTreeGenerator TG_BAMBOO_BIG = new WTBambooGenerator( true , false ); private static final A_WTTreeGenerator TG_BAMBOO_BIG = new WTBamboo( true , false );
private static final A_WTTreeGenerator TG_BAMBOO = new WTBambooGenerator( false , false ); private static final A_WTTreeGenerator TG_BAMBOO = new WTBamboo( false , false );
private static final WorldGenShrub TG_SHRUB = new WorldGenShrub( // private static final WorldGenShrub TG_SHRUB = new WorldGenShrub( //
Materials.TREE.BAMBOO.LOG.getDefaultState( ) , // Materials.TREE.BAMBOO.LOG.getDefaultState( ) , //
Materials.TREE.BAMBOO.LEAVES.getDefaultState( ).withProperty( BlockLeaves.CHECK_DECAY , false ) ); Materials.TREE.BAMBOO.LEAVES.getDefaultState( ).withProperty( BlockLeaves.CHECK_DECAY , false ) );

10
src/java/mmm/world/biome/WBTropicalSwamp.java
View file

@ -9,8 +9,8 @@ import mmm.world.WBiomeHelper;
import mmm.world.gen.WGBambooPatch; import mmm.world.gen.WGBambooPatch;
import mmm.world.gen.WGOreParameters; import mmm.world.gen.WGOreParameters;
import mmm.world.trees.A_WTTreeGenerator; import mmm.world.trees.A_WTTreeGenerator;
import mmm.world.trees.WTBambooGenerator; import mmm.world.trees.WTBamboo;
import mmm.world.trees.WTHeveaGenerator; import mmm.world.trees.WTHevea;
import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockFlower;
import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockLeaves;
import net.minecraft.block.BlockOldLeaf; import net.minecraft.block.BlockOldLeaf;
@ -47,9 +47,9 @@ public class WBTropicalSwamp
private static final IBlockState WATER_LILY = Blocks.WATERLILY.getDefaultState( ); 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_BIG = new WTBamboo( true , false );
private static final A_WTTreeGenerator TG_BAMBOO = new WTBambooGenerator( false , false ); private static final A_WTTreeGenerator TG_BAMBOO = new WTBamboo( false , false );
private static final A_WTTreeGenerator TG_HEVEA = new WTHeveaGenerator( false ); private static final A_WTTreeGenerator TG_HEVEA = new WTHevea( false );
private static final WorldGenShrub TG_SHRUB = new WorldGenShrub( // private static final WorldGenShrub TG_SHRUB = new WorldGenShrub( //
WBTropicalSwamp.OAK_LOG , WBTropicalSwamp.OAK_LEAF ); WBTropicalSwamp.OAK_LOG , WBTropicalSwamp.OAK_LEAF );

6
src/java/mmm/world/gen/WGBambooPatch.java
View file

@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import mmm.materials.Materials; import mmm.materials.Materials;
import mmm.world.trees.A_WTTreeGenerator; 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.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
@ -22,8 +22,8 @@ import net.minecraft.world.gen.feature.WorldGenerator;
public class WGBambooPatch public class WGBambooPatch
extends WorldGenerator extends WorldGenerator
{ {
private static final A_WTTreeGenerator TG_BAMBOO_BIG = new WTBambooGenerator( true , false ); private static final A_WTTreeGenerator TG_BAMBOO_BIG = new WTBamboo( true , false );
private static final A_WTTreeGenerator TG_BAMBOO = new WTBambooGenerator( false , false ); private static final A_WTTreeGenerator TG_BAMBOO = new WTBamboo( false , false );
private static final IBlockState BS_WATER = Blocks.WATER.getDefaultState( ); private static final IBlockState BS_WATER = Blocks.WATER.getDefaultState( );

10
src/java/mmm/world/trees/WTBambooGenerator.java → src/java/mmm/world/trees/WTBamboo.java
View file

@ -11,12 +11,12 @@ import net.minecraft.util.math.BlockPos;
public class WTBambooGenerator public class WTBamboo
extends A_WTTreeGenerator 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; private final int minHeight;
@ -24,13 +24,13 @@ public class WTBambooGenerator
private final int maxRingRadius; 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 ); 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 ); super( notify , materials );
this.minHeight = big ? 13 : 5; this.minHeight = big ? 13 : 5;

10
src/java/mmm/world/trees/WTHeveaGenerator.java → src/java/mmm/world/trees/WTHevea.java
View file

@ -10,24 +10,24 @@ import net.minecraft.util.math.BlockPos;
public class WTHeveaGenerator public class WTHevea
extends A_WTTreeGenerator 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 ); super( notify , Materials.TREE.HEVEA );
} }
// Used for sapling gen // Used for sapling gen
protected WTHeveaGenerator( ) protected WTHevea( )
{ {
super( true , null ); super( true , null );
} }

12
src/java/mmm/world/trees/WTBigHeveaGenerator.java → src/java/mmm/world/trees/WTHeveaBig.java
View file

@ -10,24 +10,24 @@ import net.minecraft.util.math.BlockPos;
public class WTBigHeveaGenerator public class WTHeveaBig
extends WTHeveaGenerator 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 ); super( notify );
} }
// Used for sapling gen // Used for sapling gen
protected WTBigHeveaGenerator( ) protected WTHeveaBig( )
{ {
super( ); super( );
} }