etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed some generation issues with redwood trees

Browse source
This commit is contained in:
Adubbz 2016-01-21 20:11:17 +11:00
parent 0253add36a
commit 273ceb9411
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/biomesoplenty/api/block/BlockQueries.java
View file

@ -23,6 +23,7 @@ public class BlockQueries
public static IBlockPosQuery surfaceBlocks;
public static IBlockPosQuery groundBlocks;
public static IBlockPosQuery solid;
public static IBlockPosQuery replaceable;
public static IBlockPosQuery fertile;
public static IBlockPosQuery fertileOrNetherrack;

11
src/main/java/biomesoplenty/common/init/ModBlockQueries.java
View file

@ -73,6 +73,17 @@ public class ModBlockQueries
}
};
//Match replacable blocks
replaceable = new IBlockPosQuery()
{
// Block.setBlockUnbreakable sets the hardness value to -1.0F
@Override
public boolean matches(World world, BlockPos pos)
{
return world.getBlockState(pos).getBlock().isReplaceable(world, pos);
}
};
air = new BlockQueryMaterial(Material.air);
airOrLeaves = new BlockQueryMaterial(Material.air, Material.leaves);

8
src/main/java/biomesoplenty/common/world/feature/tree/GeneratorRedwoodTree.java
View file

@ -36,7 +36,7 @@ public class GeneratorRedwoodTree extends GeneratorTreeBase
this.minHeight = 40;
this.maxHeight = 60;
this.placeOn = BlockQueries.fertile;
this.replace = BlockQueries.airOrLeaves;
this.replace = BlockQueries.replaceable;
this.log = BlockBOPLog.paging.getVariantState(BOPWoods.REDWOOD);
this.leaves = BlockBOPLeaves.paging.getVariantState(BOPTrees.REDWOOD);
this.vine = null;
@ -148,11 +148,13 @@ public class GeneratorRedwoodTree extends GeneratorTreeBase
// Move up to space above ground
pos = pos.up();
GeneratorSpike spikeGenerator = (new GeneratorSpike.Builder().with(this.log).replace(BlockQueries.anything).minRadius(4).maxRadius(4).create());
// check that there's room and if the blocks below are suitable
if (!this.canPlaceHere(world, pos, height, 4)) {return false;}
if (!this.canPlaceHere(world, pos, height, 1) || !spikeGenerator.canPlaceHere(world, pos, height, 4)) {return false;}
//Generate the base of the tree
(new GeneratorSpike.Builder().with(this.log).minRadius(4).maxRadius(4).create()).generate(world, random, pos);
spikeGenerator.generate(world, random, pos);
BlockPos trunkTop = pos;
//Move upwards until the block above this is air