From 8f6d19f8530786a5235a52dc65f9e42837b457ac Mon Sep 17 00:00:00 2001 From: Forstride Date: Sat, 22 Apr 2017 11:27:29 -0400 Subject: [PATCH] Fixed overgrown stone, toned down the frequency of wasp hives --- .../common/biome/nether/BOPHellBiome.java | 2 +- .../common/biome/vanilla/BiomeExtHell.java | 2 +- .../common/block/BlockBOPGrass.java | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biome/nether/BOPHellBiome.java b/src/main/java/biomesoplenty/common/biome/nether/BOPHellBiome.java index 39c3f05e5..7c83021c9 100644 --- a/src/main/java/biomesoplenty/common/biome/nether/BOPHellBiome.java +++ b/src/main/java/biomesoplenty/common/biome/nether/BOPHellBiome.java @@ -58,7 +58,7 @@ public class BOPHellBiome extends BOPBiome this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntityMagmaCube.class, 2, 4, 4)); this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntityEnderman.class, 1, 4, 4)); - this.addGenerator("hive", GeneratorStage.PRE, (new GeneratorHive.Builder()).amountPerChunk(0.3F).create()); + this.addGenerator("hive", GeneratorStage.PRE, (new GeneratorHive.Builder()).amountPerChunk(0.2F).create()); } @Override diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtHell.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtHell.java index e94f3a255..dfbc09dab 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtHell.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtHell.java @@ -33,7 +33,7 @@ public class BiomeExtHell extends ExtendedBiomeWrapper Biomes.HELL.theBiomeDecorator.sandPerChunk2 = -999; //this.theBiomeDecorator.generateLakes = false; - this.addGenerator("hive", GeneratorStage.PRE, (new GeneratorHive.Builder()).amountPerChunk(0.3F).create()); + this.addGenerator("hive", GeneratorStage.PRE, (new GeneratorHive.Builder()).amountPerChunk(0.2F).create()); } @Override diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java index c8b019b41..b8c3cbcd4 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java @@ -437,14 +437,26 @@ public class BlockBOPGrass extends BlockGrass implements IBOPBlock, ISustainsPla @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(getDirtBlock(state)); + switch ((BOPGrassType) state.getValue(VARIANT)) + { + case OVERGROWN_STONE: + return Item.getItemFromBlock(Blocks.COBBLESTONE.getDefaultState().getBlock()); + default: + return Item.getItemFromBlock(getDirtBlock(state)); + } } // goes hand in hand with getItemDropped() above to determine precisely what is dropped @Override public int damageDropped(IBlockState state) { - return getDirtBlockMeta(state); + switch ((BOPGrassType) state.getValue(VARIANT)) + { + case OVERGROWN_STONE: + return 0; + default: + return getDirtBlockMeta(state); + } } @@ -465,7 +477,7 @@ public class BlockBOPGrass extends BlockGrass implements IBOPBlock, ISustainsPla case OVERGROWN_NETHERRACK: return Blocks.NETHERRACK.getDefaultState(); case OVERGROWN_STONE: - return Blocks.COBBLESTONE.getDefaultState(); + return Blocks.STONE.getDefaultState(); case ORIGIN: case DAISY: default: return Blocks.DIRT.getStateFromMeta(BlockDirt.DirtType.DIRT.getMetadata()); }