Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-06-28 15:39:09 +02:00
Code Issues Projects Releases Wiki Activity

Stop lush cave gen from destroying chests

Browse source 
Should close #266
This commit is contained in:
Ellpeck 2016-10-01 23:02:46 +02:00
parent fe974365b1
commit 06d6aba0c5
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,9 +13,11 @@ package de.ellpeck.actuallyadditions.mod.gen;
import net.minecraft.block.Block; 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.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.*;
import net.minecraft.world.storage.loot.ILootContainer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -75,7 +77,7 @@ public class WorldGenLushCaves extends WorldGenerator{
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){
BlockPos pos = center.add(x, y, z); BlockPos pos = center.add(x, y, z);
if(!this.checkBedrock(world, pos)){ if(!this.checkIndestructable(world, pos)){
world.setBlockToAir(pos); world.setBlockToAir(pos);
} }
} }
@ -90,7 +92,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(!this.checkIndestructable(world, pos) && !this.checkIndestructable(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());
} }
@ -100,13 +102,19 @@ public class WorldGenLushCaves extends WorldGenerator{
} }
} }
private boolean checkBedrock(World world, BlockPos pos){ private boolean checkIndestructable(World world, BlockPos pos){
IBlockState state = world.getBlockState(pos); IBlockState state = world.getBlockState(pos);
if(state != null){ if(state != null){
Block block = state.getBlock(); Block block = state.getBlock();
if(block != null && (block.isAir(state, world, pos) || block.getHarvestLevel(state) >= 0F)){ if(block != null && (block.isAir(state, world, pos) || block.getHarvestLevel(state) >= 0F)){
return false; return false;
} }
//If this isn't checked, the game crashes because it tries to destroy a chest that doesn't have any loot yet :v
TileEntity tile = world.getTileEntity(pos);
if(tile instanceof ILootContainer){
return false;
}
} }
return true; return true;
} }