diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java b/src/minecraft/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java index e3482609b..8295e9e86 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java @@ -23,7 +23,7 @@ public class BiomeGenCherryBlossomGrove extends BiomeGenBase this.customBiomeDecorator.whiteFlowersPerChunk = 30; this.customBiomeDecorator.tinyFlowersPerChunk = 25; this.customBiomeDecorator.grassPerChunk = 15; - this.customBiomeDecorator.lilyflowersPerChunk = 6; + this.customBiomeDecorator.lilyflowersPerChunk = 9; this.customBiomeDecorator.generatePumpkins = false; } diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenSeasonalForest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenSeasonalForest.java index 667119356..f0439c397 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenSeasonalForest.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenSeasonalForest.java @@ -33,7 +33,6 @@ public class BiomeGenSeasonalForest extends BiomeGenBase this.customBiomeDecorator.grassPerChunk = 8; this.customBiomeDecorator.flowersPerChunk = -999; this.customBiomeDecorator.toadstoolsPerChunk = 4; - this.customBiomeDecorator.poisonIvyPerChunk = 1; } /** diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java index cc189f5b0..aaa58d2b2 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java @@ -195,8 +195,8 @@ public class BlockBOPFlower extends BlockFlower this.checkFlowerChange(world, x, y, z); if (world.getBlockMetadata(x, y, z) == SUNFLOWERTOP && world.getBlockId(x, y - 1, z) == this.blockID && world.getBlockMetadata(x, y - 1, z) != SUNFLOWERBOTTOM) world.setBlockToAir(x, y, z); - //if (world.getBlockMetadata(x, y, z) == CATTAILBOTTOM && world.getBlockId(x, y + 1, z) != this.blockID) - // world.setBlock(x, y, z, this.blockID, 7, 2); + if (world.getBlockMetadata(x, y, z) == SUNFLOWERBOTTOM && world.getBlockId(x, y + 1, z) != this.blockID) + world.setBlockToAir(x, y, z); } @Override diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java index cd9e1730d..47a824620 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java @@ -73,7 +73,7 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable public void getSubBlocks(int blockID, CreativeTabs par2CreativeTabs, List list) { for (int i = 0; i < foliageTypes.length; ++i) - if (i != GRASSTOP) + if (i != GRASSTOP && i != 8) list.add(new ItemStack(blockID, 1, i)); } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java b/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java index 00e91fd8e..17ea3d109 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java @@ -180,8 +180,8 @@ public class BlockBOPPlant extends BlockFlower implements IShearable this.checkFlowerChange(world, x, y, z); if (world.getBlockMetadata(x, y, z) == CATTAILTOP && world.getBlockId(x, y - 1, z) == this.blockID && world.getBlockMetadata(x, y - 1, z) != CATTAILBOTTOM) world.setBlockToAir(x, y, z); - //if (world.getBlockMetadata(x, y, z) == CATTAILBOTTOM && world.getBlockId(x, y + 1, z) != this.blockID) - // world.setBlock(x, y, z, this.blockID, 7, 2); + if (world.getBlockMetadata(x, y, z) == CATTAILBOTTOM && world.getBlockId(x, y + 1, z) != this.blockID) + world.setBlockToAir(x, y, z);; } @Override diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index b0b7af9e5..6a478e816 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -264,7 +264,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.plants.get(),1,5), "Thorns"); LanguageRegistry.addName(new ItemStack(Blocks.foliage.get(),1,3), "High Grass"); LanguageRegistry.addName(Blocks.ashStone.get(), "Ash Stone"); - LanguageRegistry.addName(Blocks.hardIce.get(), "Hard Ice"); + LanguageRegistry.addName(Blocks.hardIce.get(), "Hardened Ice"); LanguageRegistry.addName(new ItemStack(Blocks.leaves2.get(),1,2), "Maple Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,7), "Orange Autumn Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leaves2.get(),1,1), "Pink Cherry Leaves"); @@ -334,9 +334,9 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.plants.get(),1,3), "Dune Grass"); LanguageRegistry.addName(new ItemStack(Blocks.plants.get(),1,2), "Desert Sprouts"); LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,1), "Mangrove Sapling"); - LanguageRegistry.addName(Blocks.hardSand.get(), "Hard Sand"); + LanguageRegistry.addName(Blocks.hardSand.get(), "Hardened Sand"); LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,0), "Acacia Sapling"); - LanguageRegistry.addName(Blocks.hardDirt.get(), "Hard Dirt"); + LanguageRegistry.addName(Blocks.hardDirt.get(), "Hardened Dirt"); // LanguageRegistry.addName(Blocks.holyGrass.get(), "Holy Grass"); LanguageRegistry.addName(new ItemStack(Blocks.holyGrass.get(), 1, 0), "Purified Grass"); LanguageRegistry.addName(new ItemStack(Blocks.holyGrass.get(), 1, 1), "Smoldering Grass"); diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_highgrass.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_highgrass.png index fba5da266..4511d9386 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_highgrass.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_highgrass.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/quicksand.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/quicksand.png index 3bfaadf64..1a7f37809 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/quicksand.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/quicksand.png differ