Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Make sure caves don't go through bedrock

Browse source 
Closes #248
This commit is contained in:
Ellpeck 2016-09-25 21:10:37 +02:00
parent 1d77f1e168
commit fe974365b1
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java
View file

@ -71,7 +71,7 @@ public class OreGen implements IWorldGenerator{
if(ConfigBoolValues.GEN_LUSH_CAVES.isEnabled() && random.nextInt(ConfigIntValues.LUSH_CAVE_CHANCE.getValue()) <= 0){ if(ConfigBoolValues.GEN_LUSH_CAVES.isEnabled() && random.nextInt(ConfigIntValues.LUSH_CAVE_CHANCE.getValue()) <= 0){
BlockPos posAtHeight = world.getTopSolidOrLiquidBlock(new BlockPos(x+random.nextInt(16)+8, 0, z+random.nextInt(16)+8)); BlockPos posAtHeight = world.getTopSolidOrLiquidBlock(new BlockPos(x+random.nextInt(16)+8, 0, z+random.nextInt(16)+8));
this.caveGen.generate(world, random, posAtHeight.down(MathHelper.getRandomIntegerInRange(random, 10, posAtHeight.getY()-10))); this.caveGen.generate(world, random, posAtHeight.down(MathHelper.getRandomIntegerInRange(random, 15, posAtHeight.getY()-15)));
} }
} }

19
src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java
View file

@ -10,6 +10,7 @@
package de.ellpeck.actuallyadditions.mod.gen; package de.ellpeck.actuallyadditions.mod.gen;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -73,7 +74,10 @@ public class WorldGenLushCaves extends WorldGenerator{
for(double y = -radius; y < radius; y++){ for(double y = -radius; y < radius; y++){
for(double z = -radius; z < radius; z++){ for(double z = -radius; z < radius; z++){
if(Math.sqrt((x*x)+(y*y)+(z*z)) < radius){ if(Math.sqrt((x*x)+(y*y)+(z*z)) < radius){
world.setBlockToAir(center.add(x, y, z)); BlockPos pos = center.add(x, y, z);
if(!this.checkBedrock(world, pos)){
world.setBlockToAir(pos);
}
} }
} }
} }
@ -86,6 +90,7 @@ public class WorldGenLushCaves extends WorldGenerator{
IBlockState state = world.getBlockState(pos); IBlockState state = world.getBlockState(pos);
BlockPos posUp = pos.up(); BlockPos posUp = pos.up();
IBlockState stateUp = world.getBlockState(posUp); IBlockState stateUp = world.getBlockState(posUp);
if(!this.checkBedrock(world, pos) && !this.checkBedrock(world, posUp)){
if(!state.getBlock().isAir(state, world, pos) && stateUp.getBlock().isAir(stateUp, world, posUp)){ if(!state.getBlock().isAir(state, world, pos) && stateUp.getBlock().isAir(stateUp, world, posUp)){
world.setBlockState(pos, Blocks.GRASS.getDefaultState()); world.setBlockState(pos, Blocks.GRASS.getDefaultState());
} }
@ -93,4 +98,16 @@ public class WorldGenLushCaves extends WorldGenerator{
} }
} }
} }
}
private boolean checkBedrock(World world, BlockPos pos){
IBlockState state = world.getBlockState(pos);
if(state != null){
Block block = state.getBlock();
if(block != null && (block.isAir(state, world, pos) || block.getHarvestLevel(state) >= 0F)){
return false;
}
}
return true;
}
} }