Cleanup

src/minecraft/biomesoplenty/BiomesOPlenty.java

@@ -64,7 +64,8 @@ public class BiomesOPlenty
 
 		if (isClient)
 		{
-			for (String soundFile : soundFiles) try
+			for (String soundFile : soundFiles) {
+				try
 				{
 					File file = new File(Minecraft.getMinecraftDir().getAbsolutePath() + "/resources/mod/streaming/" + soundFile);
 					if (!file.exists()) {
@@ -82,7 +83,9 @@ public class BiomesOPlenty
 						}
 						out.close();
 						istream.close();
-					if (size == 0) file.delete();
+						if (size == 0) {
+							file.delete();
+						}
 					}
 				}
 				catch (Exception e)
@@ -91,6 +94,7 @@ public class BiomesOPlenty
 					e.printStackTrace();
 				}
 			}
+		}
 
 		BOPConfiguration.init(event.getSuggestedConfigurationFile());
 

src/minecraft/biomesoplenty/ClientProxy.java

@@ -53,14 +53,15 @@ public class ClientProxy extends CommonProxy {
 	{
 		EntityFX entityfx = null;
 
-         if (string == "mud")
+		if (string == "mud") {
 			entityfx = new EntityBreakingFX(mc.theWorld, x, y, z, Items.mudball.get(), mc.renderEngine);
-         else if (string == "dart")
+		} else if (string == "dart") {
 			entityfx = new EntityBreakingFX(mc.theWorld, x, y, z, Items.dart.get(), mc.renderEngine);
-         else if (string == "dandelion")
+		} else if (string == "dandelion") {
 			entityfx = new EntityDandelionFX(mc.theWorld, x, y, z, 2.0F);
-         else if (string == "steam")
+		} else if (string == "steam") {
 			entityfx = new EntitySteamFX(mc.theWorld, x, y, z, 0.0D, 0.0D, 0.0D);
+		}
 
 		mc.effectRenderer.addEffect(entityfx);
 	}

src/minecraft/biomesoplenty/api/BlockReferences.java

@@ -182,14 +182,10 @@ public class BlockReferences {
 		int stackmeta = EnumBlocks.valueOf(string).meta;
 
 		if (stackmeta != 0)
-		{
 			return new ItemStack(stackblock.get(), 1, stackmeta);
-		}
 		else
-		{
 			return new ItemStack(stackblock.get(), 1);
 	}
-	}
 
 	public static int getBlockID(String string)
 	{

src/minecraft/biomesoplenty/api/Blocks.java

@@ -85,13 +85,13 @@ public class Blocks
 	//Nether
 	public static Optional<? extends Block> bones                       = Optional.absent();
 
-//    public static Optional<? extends Block> amethystBlock               = Optional.absent();
+	//    public static Optional<? extends Block> amethystBlock               = Optional.absent();
 	public static Optional<? extends Block> amethystOre                 = Optional.absent();
-//    public static Optional<? extends Block> bambooThatching             = Optional.absent();
+	//    public static Optional<? extends Block> bambooThatching             = Optional.absent();
 	public static Optional<? extends Block> mudBrick                    = Optional.absent();
-//    public static Optional<? extends Block> smolderingGrass             = Optional.absent();
-//    public static Optional<? extends Block> quicksand                   = Optional.absent();
-//    public static Optional<? extends Block> grass                       = Optional.absent();
+	//    public static Optional<? extends Block> smolderingGrass             = Optional.absent();
+	//    public static Optional<? extends Block> quicksand                   = Optional.absent();
+	//    public static Optional<? extends Block> grass                       = Optional.absent();
 
 	public static Optional<? extends Block> promisedPortal              = Optional.absent();
 

src/minecraft/biomesoplenty/armor/ArmorAmethyst.java

@@ -23,25 +23,21 @@ public class ArmorAmethyst extends ItemArmor implements IArmorTextureProvider
 	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
 	{
 		if (par2ItemStack.itemID == Items.miscItems.get().itemID && par2ItemStack.getItemDamage() == 2)
-		{
 			return true;
-		}
 		else
-		{
 			return false;
 	}
-    }
 
+	@Override
 	public String getArmorTextureFile(ItemStack par1) {
-		if(par1.itemID == Items.helmetAmethyst.get().itemID||par1.itemID == Items.chestplateAmethyst.get().itemID||par1.itemID == Items.bootsAmethyst.get().itemID){
+		if(par1.itemID == Items.helmetAmethyst.get().itemID||par1.itemID == Items.chestplateAmethyst.get().itemID||par1.itemID == Items.bootsAmethyst.get().itemID)
 			return CommonProxy.ARMOR_AMETHYST1_PNG;
-		}
-		if(par1.itemID == Items.leggingsAmethyst.get().itemID){
+		if(par1.itemID == Items.leggingsAmethyst.get().itemID)
 			return CommonProxy.ARMOR_AMETHYST2_PNG;
-		}
 		return null;
 	}
 
+	@Override
 	public void registerIcons(IconRegister iconRegister)
 	{
 		if(textureID==0){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethysthelmet"); }

src/minecraft/biomesoplenty/armor/ArmorFlowerBand.java

@@ -40,14 +40,16 @@ public class ArmorFlowerBand extends ItemArmor implements IArmorTextureProvider
 		return (new StringBuilder()).append(flowerBandTypes[itemStack.getItemDamage()]).toString();
 	}
 
+	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(IconRegister iconRegister)
 	{
 		textures = new Icon[flowerBandTypes.length];
 
-        for (int i = 0; i < flowerBandTypes.length; ++i)
+		for (int i = 0; i < flowerBandTypes.length; ++i) {
 			textures[i] = iconRegister.registerIcon("BiomesOPlenty:" + flowerBandTypes[i]);
 		}
+	}
 
 	@Override
 	public Icon getIconFromDamage(int meta)
@@ -55,6 +57,7 @@ public class ArmorFlowerBand extends ItemArmor implements IArmorTextureProvider
 		return textures[meta];
 	}
 
+	@Override
 	public String getArmorTextureFile(ItemStack par1)
 	{
 		if (par1.getItemDamage() == 0)

src/minecraft/biomesoplenty/armor/ArmorMuddy.java

@@ -19,16 +19,16 @@ public class ArmorMuddy extends ItemArmor implements IArmorTextureProvider
 		setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 	}
 
+	@Override
 	public String getArmorTextureFile(ItemStack par1) {
-		if(par1.itemID == Items.helmetMud.get().itemID||par1.itemID == Items.chestplateMud.get().itemID||par1.itemID == Items.bootsMud.get().itemID){
+		if(par1.itemID == Items.helmetMud.get().itemID||par1.itemID == Items.chestplateMud.get().itemID||par1.itemID == Items.bootsMud.get().itemID)
 			return CommonProxy.ARMOR_MUD1_PNG;
-		}
-		if(par1.itemID == Items.leggingsMud.get().itemID){
+		if(par1.itemID == Items.leggingsMud.get().itemID)
 			return CommonProxy.ARMOR_MUD2_PNG;
-		}
 		return null;
 	}
 
+	@Override
 	public void registerIcons(IconRegister iconRegister)
 	{
 		if(textureID==0){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudhelmet"); }

src/minecraft/biomesoplenty/biomes/BiomeGenAlps.java

@@ -14,21 +14,22 @@ public class BiomeGenAlps extends BiomeGenBase
 	public BiomeGenAlps(int par1)
 	{
 		super(par1);
-        this.topBlock = (byte)Block.stone.blockID;
-        this.fillerBlock = (byte)Block.stone.blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 1;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.hotSpringsPerChunk = 4;
+		topBlock = (byte)Block.stone.blockID;
+		fillerBlock = (byte)Block.stone.blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 1;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = -999;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.hotSpringsPerChunk = 4;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
 		 return new WorldGenTaiga6(false);

src/minecraft/biomesoplenty/biomes/BiomeGenArctic.java

@@ -9,19 +9,20 @@ public class BiomeGenArctic extends BiomeGenBase
 	public BiomeGenArctic(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
+		spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = -999;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
 	}
 
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 11176526;
@@ -30,6 +31,7 @@ public class BiomeGenArctic extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 11903827;

src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java

@@ -14,29 +14,28 @@ public class BiomeGenBadlands extends BiomeGenBase
 	public BiomeGenBadlands(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Blocks.hardSand.get().blockID;
-        this.fillerBlock = (byte)Block.blockClay.blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.deadBushPerChunk = 4;
-        this.customBiomeDecorator.reedsPerChunk = -999;
-		this.customBiomeDecorator.cactiPerChunk = 2;
-		this.customBiomeDecorator.clayPerChunk = 3;
-		this.customBiomeDecorator.generateClayInStone = true;
-		this.customBiomeDecorator.generateSandInStone = true;
+		spawnableCreatureList.clear();
+		topBlock = (byte)Blocks.hardSand.get().blockID;
+		fillerBlock = (byte)Block.blockClay.blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.deadBushPerChunk = 4;
+		customBiomeDecorator.reedsPerChunk = -999;
+		customBiomeDecorator.cactiPerChunk = 2;
+		customBiomeDecorator.clayPerChunk = 3;
+		customBiomeDecorator.generateClayInStone = true;
+		customBiomeDecorator.generateSandInStone = true;
 	}
 
 	/**
 	 * takes temperature, returns color
 	 */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 9814727;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenBambooForest.java

@@ -18,33 +18,36 @@ public class BiomeGenBambooForest extends BiomeGenBase
 	public BiomeGenBambooForest(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 30;
-        this.customBiomeDecorator.grassPerChunk = 5;
-		this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.bushesPerChunk = 5;
-		this.customBiomeDecorator.reedsBOPPerChunk = 6;
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 30;
+		customBiomeDecorator.grassPerChunk = 5;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.bushesPerChunk = 5;
+		customBiomeDecorator.reedsBOPPerChunk = 6;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenShrub(0, 0) : new WorldGenBambooTree(false));
+		return par1Random.nextInt(3) == 0 ? new WorldGenShrub(0, 0) : new WorldGenBambooTree(false);
 	}
 
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -67,6 +70,7 @@ public class BiomeGenBambooForest extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 10739795;
@@ -75,6 +79,7 @@ public class BiomeGenBambooForest extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 10739795;

src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java

@@ -21,36 +21,38 @@ public class BiomeGenBayou extends BiomeGenBase
 	public BiomeGenBayou(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 15;
-        this.customBiomeDecorator.grassPerChunk = 15;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.reedsPerChunk = 25;
-        this.customBiomeDecorator.mudPerChunk = 1;
-        this.customBiomeDecorator.mudPerChunk2 = 1;
-		this.customBiomeDecorator.toadstoolsPerChunk = 2;
-		this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-        this.customBiomeDecorator.waterlilyPerChunk = 2;
-        this.customBiomeDecorator.cattailsPerChunk = 1;
-		this.customBiomeDecorator.highCattailsPerChunk = 1;
-		this.customBiomeDecorator.waterLakesPerChunk = 5;
-		this.customBiomeDecorator.algaePerChunk = 1;
-		this.customBiomeDecorator.generatePumpkins = false;
-		this.waterColorMultiplier = 16767282;
-        this.spawnableWaterCreatureList.clear();
-		this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 15;
+		customBiomeDecorator.grassPerChunk = 15;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.reedsPerChunk = 25;
+		customBiomeDecorator.mudPerChunk = 1;
+		customBiomeDecorator.mudPerChunk2 = 1;
+		customBiomeDecorator.toadstoolsPerChunk = 2;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.waterlilyPerChunk = 2;
+		customBiomeDecorator.cattailsPerChunk = 1;
+		customBiomeDecorator.highCattailsPerChunk = 1;
+		customBiomeDecorator.waterLakesPerChunk = 5;
+		customBiomeDecorator.algaePerChunk = 1;
+		customBiomeDecorator.generatePumpkins = false;
+		waterColorMultiplier = 16767282;
+		spawnableWaterCreatureList.clear();
+		spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
-        return (WorldGenerator)(par1Random.nextInt(8) == 0 ? new WorldGenBayou3() : (par1Random.nextInt(2) == 0 ? new WorldGenBayou1() : new WorldGenBayou2()));
+		 return par1Random.nextInt(8) == 0 ? new WorldGenBayou3() : (par1Random.nextInt(2) == 0 ? new WorldGenBayou1() : new WorldGenBayou2());
 	 }
 
+	 @Override
 	 public void decorate(World par1World, Random par2Random, int par3, int par4)
 	 {
 		 super.decorate(par1World, par2Random, par3, par4);
@@ -68,6 +70,7 @@ public class BiomeGenBayou extends BiomeGenBase
 	 /**
 	  * Provides the basic grass color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 9154411;
@@ -76,6 +79,7 @@ public class BiomeGenBayou extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 11591816;
@@ -84,12 +88,11 @@ public class BiomeGenBayou extends BiomeGenBase
 	 /**
 	  * takes temperature, returns color
 	  */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 11322556;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenBeachGravel.java

@@ -8,12 +8,12 @@ public class BiomeGenBeachGravel extends BiomeGenBase
 	public BiomeGenBeachGravel(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Block.gravel.blockID;
-        this.fillerBlock = (byte)Block.gravel.blockID;
-        this.theBiomeDecorator.treesPerChunk = -999;
-        this.theBiomeDecorator.deadBushPerChunk = -999;
-        this.theBiomeDecorator.reedsPerChunk = -999;
-        this.theBiomeDecorator.cactiPerChunk = -999;
+		spawnableCreatureList.clear();
+		topBlock = (byte)Block.gravel.blockID;
+		fillerBlock = (byte)Block.gravel.blockID;
+		theBiomeDecorator.treesPerChunk = -999;
+		theBiomeDecorator.deadBushPerChunk = -999;
+		theBiomeDecorator.reedsPerChunk = -999;
+		theBiomeDecorator.cactiPerChunk = -999;
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenBeachOvergrown.java

@@ -14,22 +14,23 @@ public class BiomeGenBeachOvergrown extends BiomeGenBase
 	public BiomeGenBeachOvergrown(int par1)
 	{
 		super(par1);
-		this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Block.sand.blockID;
-        this.fillerBlock = (byte)Block.sand.blockID;
-        this.theBiomeDecorator.treesPerChunk = 15;
-        this.theBiomeDecorator.deadBushPerChunk = 1;
-		this.customBiomeDecorator.duneGrassPerChunk = 25;
-        this.theBiomeDecorator.reedsPerChunk = -999;
-        this.theBiomeDecorator.cactiPerChunk = 1;
-		this.customBiomeDecorator.outbackPerChunk = 5;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		spawnableCreatureList.clear();
+		topBlock = (byte)Block.sand.blockID;
+		fillerBlock = (byte)Block.sand.blockID;
+		theBiomeDecorator.treesPerChunk = 15;
+		theBiomeDecorator.deadBushPerChunk = 1;
+		customBiomeDecorator.duneGrassPerChunk = 25;
+		theBiomeDecorator.reedsPerChunk = -999;
+		theBiomeDecorator.cactiPerChunk = 1;
+		customBiomeDecorator.outbackPerChunk = 5;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
 		 return new WorldGenBogBush();

src/minecraft/biomesoplenty/biomes/BiomeGenBirchForest.java

@@ -16,31 +16,34 @@ public class BiomeGenBirchForest extends BiomeGenBase
 	public BiomeGenBirchForest(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 5;
-        this.customBiomeDecorator.grassPerChunk = 3;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.tinyFlowersPerChunk = 6;
-		this.customBiomeDecorator.poisonIvyPerChunk = 3;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 5;
+		customBiomeDecorator.grassPerChunk = 3;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.tinyFlowersPerChunk = 6;
+		customBiomeDecorator.poisonIvyPerChunk = 3;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return this.worldGeneratorForest;
+		return worldGeneratorForest;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);

src/minecraft/biomesoplenty/biomes/BiomeGenBog.java

@@ -20,27 +20,28 @@ public class BiomeGenBog extends BiomeGenBase
 	public BiomeGenBog(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 12;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = 5;
-		this.customBiomeDecorator.bushesPerChunk = 6;
-		this.customBiomeDecorator.mudPerChunk = 2;
-        this.customBiomeDecorator.mudPerChunk2 = 2;
-		this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.algaePerChunk = 2;
-		this.customBiomeDecorator.waterlilyPerChunk = 4;
-		this.customBiomeDecorator.reedsBOPPerChunk = 8;
-		this.customBiomeDecorator.blueMilksPerChunk = 1;
-		this.customBiomeDecorator.waterLakesPerChunk = 6;
-		this.customBiomeDecorator.poisonWaterPerChunk = 2;
-		this.customBiomeDecorator.generatePumpkins = false;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 12;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = 5;
+		customBiomeDecorator.bushesPerChunk = 6;
+		customBiomeDecorator.mudPerChunk = 2;
+		customBiomeDecorator.mudPerChunk2 = 2;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.algaePerChunk = 2;
+		customBiomeDecorator.waterlilyPerChunk = 4;
+		customBiomeDecorator.reedsBOPPerChunk = 8;
+		customBiomeDecorator.blueMilksPerChunk = 1;
+		customBiomeDecorator.waterLakesPerChunk = 6;
+		customBiomeDecorator.poisonWaterPerChunk = 2;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -58,14 +59,16 @@ public class BiomeGenBog extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenCypress1(false) : (par1Random.nextInt(6) == 0 ? new WorldGenCypress2(false) : new WorldGenBogBush()));
+		 return par1Random.nextInt(3) == 0 ? new WorldGenCypress1(false) : (par1Random.nextInt(6) == 0 ? new WorldGenCypress2(false) : new WorldGenBogBush());
 	}
 
 	 /**
 	  * Gets a WorldGen appropriate for this biome.
 	  */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	 {
 		 return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
@@ -74,6 +77,7 @@ public class BiomeGenBog extends BiomeGenBase
 	 /**
 	  * Provides the basic grass color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 14193503;
@@ -82,6 +86,7 @@ public class BiomeGenBog extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 14345593;

src/minecraft/biomesoplenty/biomes/BiomeGenBorealForest.java

@@ -21,16 +21,17 @@ public class BiomeGenBorealForest extends BiomeGenBase
 	public BiomeGenBorealForest(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 20;
-        this.customBiomeDecorator.grassPerChunk = 50;
+		spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 20;
+		customBiomeDecorator.grassPerChunk = 50;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
@@ -39,15 +40,17 @@ public class BiomeGenBorealForest extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(4) == 0 ? new WorldGenRainforestTree1(false) : (par1Random.nextInt(5) == 0 ? new WorldGenShrub(0,0) : (par1Random.nextInt(3) == 0 ? new WorldGenAutumn(false) : (par1Random.nextInt(3) == 0 ? this.worldGeneratorForest : new WorldGenTaiga10(false)))));
+		return par1Random.nextInt(4) == 0 ? new WorldGenRainforestTree1(false) : (par1Random.nextInt(5) == 0 ? new WorldGenShrub(0,0) : (par1Random.nextInt(3) == 0 ? new WorldGenAutumn(false) : (par1Random.nextInt(3) == 0 ? worldGeneratorForest : new WorldGenTaiga10(false))));
 		//return (WorldGenerator)(par1Random.nextInt(2) == 0 ? this.worldGeneratorTrees : (par1Random.nextInt(5) == 0 ? new WorldGenShrub(0,0) : (par1Random.nextInt(3) == 0 ? new WorldGenAutumn(false) : (par1Random.nextInt(3) == 0 ? this.worldGeneratorForest : new WorldGenTaiga10(false)))));
 	}
 
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 10467185;
@@ -56,6 +59,7 @@ public class BiomeGenBorealForest extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 13225573;

src/minecraft/biomesoplenty/biomes/BiomeGenBrushland.java

@@ -15,26 +15,28 @@ public class BiomeGenBrushland extends BiomeGenBase
 	public BiomeGenBrushland(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.customBiomeDecorator.treesPerChunk = 10;
-		this.customBiomeDecorator.grassPerChunk = 6;
-		this.customBiomeDecorator.thornsPerChunk = 4;
-		this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.generateQuicksand = true;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 10;
+		customBiomeDecorator.grassPerChunk = 6;
+		customBiomeDecorator.thornsPerChunk = 4;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.generateQuicksand = true;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(2) == 0 ? new WorldGenBrush2() : (par1Random.nextInt(5) == 0 ?  new WorldGenBrush1() : new WorldGenChaparral2()));
+		return par1Random.nextInt(2) == 0 ? new WorldGenBrush2() : (par1Random.nextInt(5) == 0 ?  new WorldGenBrush1() : new WorldGenChaparral2());
 	}
 
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 13222271;
@@ -43,6 +45,7 @@ public class BiomeGenBrushland extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 11716223;

src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java

@@ -15,30 +15,32 @@ public class BiomeGenCanyon extends BiomeGenBase
 	public BiomeGenCanyon(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Blocks.hardDirt.get().blockID;
-        this.fillerBlock = (byte)Blocks.hardDirt.get().blockID;
-        this.customBiomeDecorator.treesPerChunk = 7;
-		this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.canyonGrassPerChunk = 5;
-		this.customBiomeDecorator.aloePerChunk = 2;
-		this.customBiomeDecorator.generatePumpkins = false;
-		this.customBiomeDecorator.generateCanyon = true;
+		spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Blocks.hardDirt.get().blockID;
+		fillerBlock = (byte)Blocks.hardDirt.get().blockID;
+		customBiomeDecorator.treesPerChunk = 7;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.canyonGrassPerChunk = 5;
+		customBiomeDecorator.aloePerChunk = 2;
+		customBiomeDecorator.generatePumpkins = false;
+		customBiomeDecorator.generateCanyon = true;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(9) == 0 ? new WorldGenPineTree() : new WorldGenCanyonShrub(0,0));
+		return par1Random.nextInt(9) == 0 ? new WorldGenPineTree() : new WorldGenCanyonShrub(0,0);
 	}
 
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 11123300;
@@ -47,6 +49,7 @@ public class BiomeGenCanyon extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 11123300;

src/minecraft/biomesoplenty/biomes/BiomeGenChaparral.java

@@ -19,33 +19,36 @@ public class BiomeGenChaparral extends BiomeGenBase
 	public BiomeGenChaparral(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 8;
-        this.customBiomeDecorator.grassPerChunk = 20;
-		this.customBiomeDecorator.bushesPerChunk = 10;
-		this.customBiomeDecorator.berryBushesPerChunk = 2;
-		this.customBiomeDecorator.generateStoneInGrass = true;
-		this.customBiomeDecorator.generatePumpkins = false;
+		spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 8;
+		customBiomeDecorator.grassPerChunk = 20;
+		customBiomeDecorator.bushesPerChunk = 10;
+		customBiomeDecorator.berryBushesPerChunk = 2;
+		customBiomeDecorator.generateStoneInGrass = true;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(2) == 0 ? new WorldGenChaparral2() : (par1Random.nextInt(5) == 0 ?  new WorldGenChaparral1(0, 0) : new WorldGenChaparral3()));
+		return par1Random.nextInt(2) == 0 ? new WorldGenChaparral2() : (par1Random.nextInt(5) == 0 ?  new WorldGenChaparral1(0, 0) : new WorldGenChaparral3());
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -68,6 +71,7 @@ public class BiomeGenChaparral extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 12638301;

src/minecraft/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java

@@ -14,34 +14,37 @@ public class BiomeGenCherryBlossomGrove extends BiomeGenBase
 	public BiomeGenCherryBlossomGrove(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 3;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.pinkFlowersPerChunk = 15;
-        this.customBiomeDecorator.whiteFlowersPerChunk = 30;
-        this.customBiomeDecorator.tinyFlowersPerChunk = 25;
-        this.customBiomeDecorator.grassPerChunk = 15;
-		this.customBiomeDecorator.lilyflowersPerChunk = 9;
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 3;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.pinkFlowersPerChunk = 15;
+		customBiomeDecorator.whiteFlowersPerChunk = 30;
+		customBiomeDecorator.tinyFlowersPerChunk = 25;
+		customBiomeDecorator.grassPerChunk = 15;
+		customBiomeDecorator.lilyflowersPerChunk = 9;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenCherry2(false) : new WorldGenCherry1(false));
+		return par1Random.nextInt(3) == 0 ? new WorldGenCherry2(false) : new WorldGenCherry1(false);
 	}
 
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 10747818;
 	}
 
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 10747818;

src/minecraft/biomesoplenty/biomes/BiomeGenConiferousForest.java

@@ -22,34 +22,37 @@ public class BiomeGenConiferousForest extends BiomeGenBase
 	public BiomeGenConiferousForest(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4));
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 6;
-        this.customBiomeDecorator.grassPerChunk = 10;
-		this.customBiomeDecorator.toadstoolsPerChunk = 3;
-		this.customBiomeDecorator.violetsPerChunk = 2;
-		this.customBiomeDecorator.blueMilksPerChunk = 1;
-		this.customBiomeDecorator.poisonIvyPerChunk = 1;
-		this.customBiomeDecorator.berryBushesPerChunk = 1;
+		spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 6;
+		customBiomeDecorator.grassPerChunk = 10;
+		customBiomeDecorator.toadstoolsPerChunk = 3;
+		customBiomeDecorator.violetsPerChunk = 2;
+		customBiomeDecorator.blueMilksPerChunk = 1;
+		customBiomeDecorator.poisonIvyPerChunk = 1;
+		customBiomeDecorator.berryBushesPerChunk = 1;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(5) == 0 ? new WorldGenTaiga3(false) : (par1Random.nextInt(3) == 0 ? new WorldGenTaiga4(false) : new WorldGenTaiga9(false)));
+		return par1Random.nextInt(5) == 0 ? new WorldGenTaiga3(false) : (par1Random.nextInt(3) == 0 ? new WorldGenTaiga4(false) : new WorldGenTaiga9(false));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);

src/minecraft/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java

@@ -17,26 +17,28 @@ public class BiomeGenConiferousForestSnow extends BiomeGenBase
 	public BiomeGenConiferousForestSnow(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.customBiomeDecorator.treesPerChunk = 3;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
+		spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 3;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(5) == 0 ? new WorldGenTaiga3(false) : (par1Random.nextInt(3) == 0 ? new WorldGenTaiga4(false) : new WorldGenTaiga9(false)));
+		return par1Random.nextInt(5) == 0 ? new WorldGenTaiga3(false) : (par1Random.nextInt(3) == 0 ? new WorldGenTaiga4(false) : new WorldGenTaiga9(false));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);

src/minecraft/biomesoplenty/biomes/BiomeGenCrag.java

@@ -13,25 +13,24 @@ public class BiomeGenCrag extends BiomeGenBase
 	public BiomeGenCrag(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-		this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.topBlock = (byte)Blocks.cragRock.get().blockID;
-        this.fillerBlock = (byte)Blocks.cragRock.get().blockID;
-		this.waterColorMultiplier = 944693;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		topBlock = (byte)Blocks.cragRock.get().blockID;
+		fillerBlock = (byte)Blocks.cragRock.get().blockID;
+		waterColorMultiplier = 944693;
 	}
 
 	/**
 	 * takes temperature, returns color
 	 */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 4944498;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenDeadForest.java

@@ -20,18 +20,19 @@ public class BiomeGenDeadForest extends BiomeGenBase
 	public BiomeGenDeadForest(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 3;
-		this.customBiomeDecorator.grassPerChunk = 1;
-		this.customBiomeDecorator.thornsPerChunk = 2;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.reedsPerChunk = -999;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 3;
+		customBiomeDecorator.grassPerChunk = 1;
+		customBiomeDecorator.thornsPerChunk = 2;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.reedsPerChunk = -999;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
@@ -40,19 +41,22 @@ public class BiomeGenDeadForest extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenDeadTree(false) : (par1Random.nextInt(4) == 0 ? new WorldGenTaiga5(false): new WorldGenDeadTree2(false)));
+		return par1Random.nextInt(3) == 0 ? new WorldGenDeadTree(false) : (par1Random.nextInt(4) == 0 ? new WorldGenTaiga5(false): new WorldGenDeadTree2(false));
 	}
 
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 12362085;
 	}
 
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 12362085;
@@ -61,12 +65,11 @@ public class BiomeGenDeadForest extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 9873591;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenDeadForestSnow.java

@@ -19,16 +19,17 @@ public class BiomeGenDeadForestSnow extends BiomeGenBase
 	public BiomeGenDeadForestSnow(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 2;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.reedsPerChunk = -999;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 2;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.reedsPerChunk = -999;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
@@ -37,14 +38,16 @@ public class BiomeGenDeadForestSnow extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(6) == 0 ? new WorldGenDeadTree2(false) : (par1Random.nextInt(3) == 0 ? new WorldGenTaiga5(false): new WorldGenDeadTree(false)));
+		return par1Random.nextInt(6) == 0 ? new WorldGenDeadTree2(false) : (par1Random.nextInt(3) == 0 ? new WorldGenTaiga5(false): new WorldGenDeadTree(false));
 	}
 
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 11176526;
@@ -53,6 +56,7 @@ public class BiomeGenDeadForestSnow extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 11903827;
@@ -61,12 +65,11 @@ public class BiomeGenDeadForestSnow extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 9873591;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java

@@ -18,26 +18,27 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
 	public BiomeGenDeadSwamp(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 2;
-		this.customBiomeDecorator.grassPerChunk = 25;
-		this.customBiomeDecorator.highGrassPerChunk = 1;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.reedsPerChunk = -999;
-		this.customBiomeDecorator.mudPerChunk = 3;
-        this.customBiomeDecorator.mudPerChunk2 = 3;
-		this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.reedsBOPPerChunk = 2;
-		this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-		this.waterColorMultiplier = 10661201;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 2;
+		customBiomeDecorator.grassPerChunk = 25;
+		customBiomeDecorator.highGrassPerChunk = 1;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.reedsPerChunk = -999;
+		customBiomeDecorator.mudPerChunk = 3;
+		customBiomeDecorator.mudPerChunk2 = 3;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.reedsBOPPerChunk = 2;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		waterColorMultiplier = 10661201;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
@@ -46,6 +47,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		return new WorldGenDeadTree(false);
@@ -54,11 +56,13 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 6713420;
 	}
 
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 6713420;
@@ -67,12 +71,11 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 6451816;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java

@@ -24,35 +24,37 @@ public class BiomeGenDeadlands extends BiomeGenBase
 	public BiomeGenDeadlands(int par1)
 	{
 		super(par1);
-        this.topBlock = (byte)Blocks.ash.get().blockID;
-        this.fillerBlock = (byte)Blocks.ash.get().blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = 15;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.mushroomsPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.lavaLakesPerChunk = 25;
-		this.customBiomeDecorator.smolderingGrassPerChunk = 5;
-		this.customBiomeDecorator.generatePits = true;
-        this.waterColorMultiplier = 16711680;
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityCreeper.class, 30, 1, 7));
-		this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityBat.class, 10, 8, 8));
-		this.theWorldGenerator = new WorldGenMinable(Block.silverfish.blockID, 8);
+		topBlock = (byte)Blocks.ash.get().blockID;
+		fillerBlock = (byte)Blocks.ash.get().blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = 15;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.mushroomsPerChunk = -999;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.lavaLakesPerChunk = 25;
+		customBiomeDecorator.smolderingGrassPerChunk = 5;
+		customBiomeDecorator.generatePits = true;
+		waterColorMultiplier = 16711680;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableCreatureList.add(new SpawnListEntry(EntityCreeper.class, 30, 1, 7));
+		spawnableCaveCreatureList.add(new SpawnListEntry(EntityBat.class, 10, 8, 8));
+		theWorldGenerator = new WorldGenMinable(Block.silverfish.blockID, 8);
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return new WorldGenDeadlands();
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -66,19 +68,18 @@ public class BiomeGenDeadlands extends BiomeGenBase
 			var6 = par3 + par2Random.nextInt(16);
 			var7 = par2Random.nextInt(64);
 			var8 = par4 + par2Random.nextInt(16);
-            this.theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
+			theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
 		}
 	}
 
 	/**
 	 * takes temperature, returns color
 	 */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 4464929;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenDeciduousForest.java

@@ -16,29 +16,31 @@ public class BiomeGenDeciduousForest extends BiomeGenBase
 	public BiomeGenDeciduousForest(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 15;
-        this.customBiomeDecorator.grassPerChunk = 10;
-		this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.toadstoolsPerChunk = 1;
-		this.customBiomeDecorator.bushesPerChunk = 8;
-		this.customBiomeDecorator.berryBushesPerChunk = 2;
-		this.customBiomeDecorator.blueMilksPerChunk = 2;
-		this.customBiomeDecorator.poisonIvyPerChunk = 1;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 15;
+		customBiomeDecorator.grassPerChunk = 10;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.toadstoolsPerChunk = 1;
+		customBiomeDecorator.bushesPerChunk = 8;
+		customBiomeDecorator.berryBushesPerChunk = 2;
+		customBiomeDecorator.blueMilksPerChunk = 2;
+		customBiomeDecorator.poisonIvyPerChunk = 1;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(4) == 0 ? new WorldGenShrub(2,2) : new WorldGenDeciduous(false));
+		return par1Random.nextInt(4) == 0 ? new WorldGenShrub(2,2) : new WorldGenDeciduous(false);
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(5) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
@@ -47,6 +49,7 @@ public class BiomeGenDeciduousForest extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 12695369;
@@ -55,6 +58,7 @@ public class BiomeGenDeciduousForest extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 12896570;

src/minecraft/biomesoplenty/biomes/BiomeGenDesertNew.java

@@ -14,21 +14,22 @@ public class BiomeGenDesertNew extends BiomeGenBase
 	public BiomeGenDesertNew(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Block.sand.blockID;
-        this.fillerBlock = (byte)Block.sand.blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.deadBushPerChunk = 2;
-        this.customBiomeDecorator.reedsPerChunk = 50;
-        this.customBiomeDecorator.cactiPerChunk = 10;
-		this.customBiomeDecorator.desertSproutsPerChunk = 1;
-		this.customBiomeDecorator.tinyCactiPerChunk = 5;
-		this.customBiomeDecorator.generateQuicksand = true;
-		this.customBiomeDecorator.aloePerChunk = 2;
+		spawnableCreatureList.clear();
+		topBlock = (byte)Block.sand.blockID;
+		fillerBlock = (byte)Block.sand.blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.deadBushPerChunk = 2;
+		customBiomeDecorator.reedsPerChunk = 50;
+		customBiomeDecorator.cactiPerChunk = 10;
+		customBiomeDecorator.desertSproutsPerChunk = 1;
+		customBiomeDecorator.tinyCactiPerChunk = 5;
+		customBiomeDecorator.generateQuicksand = true;
+		customBiomeDecorator.aloePerChunk = 2;
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);

src/minecraft/biomesoplenty/biomes/BiomeGenDunes.java

@@ -13,29 +13,28 @@ public class BiomeGenDunes extends BiomeGenBase
 	public BiomeGenDunes(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Block.sand.blockID;
-        this.fillerBlock = (byte)Block.sand.blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.deadBushPerChunk = -999;
-		this.customBiomeDecorator.duneGrassPerChunk = 10;
-		this.customBiomeDecorator.desertSproutsPerChunk = 5;
-		this.customBiomeDecorator.aloePerChunk = 1;
-        this.customBiomeDecorator.reedsPerChunk = -999;
-		this.customBiomeDecorator.generateLakes = false;
+		spawnableCreatureList.clear();
+		topBlock = (byte)Block.sand.blockID;
+		fillerBlock = (byte)Block.sand.blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.deadBushPerChunk = -999;
+		customBiomeDecorator.duneGrassPerChunk = 10;
+		customBiomeDecorator.desertSproutsPerChunk = 5;
+		customBiomeDecorator.aloePerChunk = 1;
+		customBiomeDecorator.reedsPerChunk = -999;
+		customBiomeDecorator.generateLakes = false;
 	}
 
 	/**
 	 * takes temperature, returns color
 	 */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 14203007;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenFen.java

@@ -22,35 +22,37 @@ public class BiomeGenFen extends BiomeGenBase
 	public BiomeGenFen(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 10;
-        this.customBiomeDecorator.grassPerChunk = 15;
-		this.customBiomeDecorator.highGrassPerChunk = 1;
-		this.customBiomeDecorator.waterlilyPerChunk = 1;
-		this.customBiomeDecorator.cattailsPerChunk = 1;
-		this.customBiomeDecorator.highCattailsPerChunk = 1;
-		this.customBiomeDecorator.pondsPerChunk = 99;
-		this.customBiomeDecorator.toadstoolsPerChunk = 2;
-		this.customBiomeDecorator.mushroomsPerChunk = 8;
-		this.customBiomeDecorator.mudPerChunk = 1;
-        this.customBiomeDecorator.mudPerChunk2 = 1;
-		this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.reedsBOPPerChunk = 5;
-		this.customBiomeDecorator.algaePerChunk = 1;
-		this.customBiomeDecorator.portobellosPerChunk = 1;
-		this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 10;
+		customBiomeDecorator.grassPerChunk = 15;
+		customBiomeDecorator.highGrassPerChunk = 1;
+		customBiomeDecorator.waterlilyPerChunk = 1;
+		customBiomeDecorator.cattailsPerChunk = 1;
+		customBiomeDecorator.highCattailsPerChunk = 1;
+		customBiomeDecorator.pondsPerChunk = 99;
+		customBiomeDecorator.toadstoolsPerChunk = 2;
+		customBiomeDecorator.mushroomsPerChunk = 8;
+		customBiomeDecorator.mudPerChunk = 1;
+		customBiomeDecorator.mudPerChunk2 = 1;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.reedsBOPPerChunk = 5;
+		customBiomeDecorator.algaePerChunk = 1;
+		customBiomeDecorator.portobellosPerChunk = 1;
+		spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenFen2(false) : (par1Random.nextInt(20) == 0 ? new WorldGenDeadTree(false) : new WorldGenFen1()));
+		return par1Random.nextInt(3) == 0 ? new WorldGenFen2(false) : (par1Random.nextInt(20) == 0 ? new WorldGenDeadTree(false) : new WorldGenFen1());
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -68,6 +70,7 @@ public class BiomeGenFen extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	 {
 		 return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1)));
@@ -76,6 +79,7 @@ public class BiomeGenFen extends BiomeGenBase
 	 /**
 	  * Provides the basic grass color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 12240001;
@@ -84,6 +88,7 @@ public class BiomeGenFen extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 13547897;

src/minecraft/biomesoplenty/biomes/BiomeGenField.java

@@ -13,17 +13,18 @@ public class BiomeGenField extends BiomeGenBase
 	public BiomeGenField(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.customBiomeDecorator.treesPerChunk = 1;
-        this.customBiomeDecorator.flowersPerChunk = 1;
-        this.customBiomeDecorator.grassPerChunk = 999;
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 1;
+		customBiomeDecorator.flowersPerChunk = 1;
+		customBiomeDecorator.grassPerChunk = 999;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		return new WorldGenLargeTree(false);
@@ -32,6 +33,7 @@ public class BiomeGenField extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 10878796;
@@ -40,6 +42,7 @@ public class BiomeGenField extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 10878796;

src/minecraft/biomesoplenty/biomes/BiomeGenForestNew.java

@@ -17,28 +17,30 @@ public class BiomeGenForestNew extends BiomeGenBase
 	public BiomeGenForestNew(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 10;
-        this.customBiomeDecorator.grassPerChunk = 2;
-		this.customBiomeDecorator.hydrangeasPerChunk = 2;
-		this.customBiomeDecorator.whiteFlowersPerChunk = 1;
-		this.customBiomeDecorator.reedsBOPPerChunk = 5;
-		this.customBiomeDecorator.poisonIvyPerChunk = 2;
-		this.customBiomeDecorator.sunflowersPerChunk = 1;
-		this.customBiomeDecorator.berryBushesPerChunk = 2;
+		spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 10;
+		customBiomeDecorator.grassPerChunk = 2;
+		customBiomeDecorator.hydrangeasPerChunk = 2;
+		customBiomeDecorator.whiteFlowersPerChunk = 1;
+		customBiomeDecorator.reedsBOPPerChunk = 5;
+		customBiomeDecorator.poisonIvyPerChunk = 2;
+		customBiomeDecorator.sunflowersPerChunk = 1;
+		customBiomeDecorator.berryBushesPerChunk = 2;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		//return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenWhiteOak1() : (par1Random.nextInt(5) == 0 ? new WorldGenAlder2() : (par1Random.nextInt(8) == 0 ? new WorldGenAlder1() : (par1Random.nextInt(4) == 0 ? new WorldGenPaperBirch2() : (par1Random.nextInt(7) == 0 ? new WorldGenPaperBirch1() : new WorldGenWhiteOak2())))));
-		return (WorldGenerator)(par1Random.nextInt(5) == 0 ? this.worldGeneratorForest : (par1Random.nextInt(10) == 0 ? this.worldGeneratorBigTree : this.worldGeneratorTrees));
+		return par1Random.nextInt(5) == 0 ? worldGeneratorForest : (par1Random.nextInt(10) == 0 ? worldGeneratorBigTree : worldGeneratorTrees);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);

src/minecraft/biomesoplenty/biomes/BiomeGenFrostForest.java

@@ -14,26 +14,28 @@ public class BiomeGenFrostForest extends BiomeGenBase
 	public BiomeGenFrostForest(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 3;
-        this.customBiomeDecorator.grassPerChunk = 1;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.mushroomsPerChunk = -999;
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 3;
+		customBiomeDecorator.grassPerChunk = 1;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.mushroomsPerChunk = -999;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return this.worldGeneratorTrees;
+		return worldGeneratorTrees;
 	}
 
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 11261628;
@@ -42,6 +44,7 @@ public class BiomeGenFrostForest extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 11261628;
@@ -50,12 +53,11 @@ public class BiomeGenFrostForest extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 13557994;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java

@@ -26,32 +26,33 @@ public class BiomeGenFungiForest extends BiomeGenBase
 	public BiomeGenFungiForest(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 8;
-        this.customBiomeDecorator.grassPerChunk = 6;
-		this.customBiomeDecorator.sproutsPerChunk = 2;
-		this.customBiomeDecorator.bushesPerChunk = 2;
-		this.customBiomeDecorator.highGrassPerChunk = 1;
-        this.customBiomeDecorator.mushroomsPerChunk = 8;
-        this.customBiomeDecorator.bigMushroomsPerChunk = 8;
-		this.customBiomeDecorator.toadstoolsPerChunk = 5;
-		this.customBiomeDecorator.portobellosPerChunk = 7;
-		this.customBiomeDecorator.blueMilksPerChunk = 4;
-		this.customBiomeDecorator.glowshroomsPerChunk = 2;
-        this.customBiomeDecorator.blueFlowersPerChunk = 3;
-		this.customBiomeDecorator.cattailsPerChunk = 1;
-		this.customBiomeDecorator.highCattailsPerChunk = 2;
-		this.customBiomeDecorator.reedsBOPPerChunk = 1;
-		this.customBiomeDecorator.lilyflowersPerChunk = 2;
-        this.customBiomeDecorator.generateMycelium = true;
-		this.customBiomeDecorator.generatePumpkins = true;
-        this.waterColorMultiplier = 65326;
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityMooshroom.class, 3, 4, 8));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 8;
+		customBiomeDecorator.grassPerChunk = 6;
+		customBiomeDecorator.sproutsPerChunk = 2;
+		customBiomeDecorator.bushesPerChunk = 2;
+		customBiomeDecorator.highGrassPerChunk = 1;
+		customBiomeDecorator.mushroomsPerChunk = 8;
+		customBiomeDecorator.bigMushroomsPerChunk = 8;
+		customBiomeDecorator.toadstoolsPerChunk = 5;
+		customBiomeDecorator.portobellosPerChunk = 7;
+		customBiomeDecorator.blueMilksPerChunk = 4;
+		customBiomeDecorator.glowshroomsPerChunk = 2;
+		customBiomeDecorator.blueFlowersPerChunk = 3;
+		customBiomeDecorator.cattailsPerChunk = 1;
+		customBiomeDecorator.highCattailsPerChunk = 2;
+		customBiomeDecorator.reedsBOPPerChunk = 1;
+		customBiomeDecorator.lilyflowersPerChunk = 2;
+		customBiomeDecorator.generateMycelium = true;
+		customBiomeDecorator.generatePumpkins = true;
+		waterColorMultiplier = 65326;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableCreatureList.add(new SpawnListEntry(EntityMooshroom.class, 3, 4, 8));
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -69,14 +70,16 @@ public class BiomeGenFungiForest extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
-        return (WorldGenerator)(par1Random.nextInt(2) == 0 ? new WorldGenThickTree(false) : (par1Random.nextInt(5) == 0 ? new WorldGenWillow() : (par1Random.nextInt(3) == 0 ? new WorldGenPrairie(false) : new WorldGenSwampTall())));
+		 return par1Random.nextInt(2) == 0 ? new WorldGenThickTree(false) : (par1Random.nextInt(5) == 0 ? new WorldGenWillow() : (par1Random.nextInt(3) == 0 ? new WorldGenPrairie(false) : new WorldGenSwampTall()));
 	 }
 
 	 /**
 	  * Gets a WorldGen appropriate for this biome.
 	  */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	 {
 		 return (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : (par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1))));
@@ -85,6 +88,7 @@ public class BiomeGenFungiForest extends BiomeGenBase
 	 /**
 	  * Provides the basic grass color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 5359235;
@@ -93,6 +97,7 @@ public class BiomeGenFungiForest extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 5359235;
@@ -101,12 +106,11 @@ public class BiomeGenFungiForest extends BiomeGenBase
 	 /**
 	  * takes temperature, returns color
 	  */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 5888980;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenGarden.java

@@ -20,30 +20,31 @@ public class BiomeGenGarden extends BiomeGenBase
 	public BiomeGenGarden(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 1;
-        this.customBiomeDecorator.flowersPerChunk = 20;
-        this.customBiomeDecorator.whiteFlowersPerChunk = 25;
-		this.customBiomeDecorator.tinyFlowersPerChunk = 15;
-		this.customBiomeDecorator.hydrangeasPerChunk = 3;
-		this.customBiomeDecorator.sproutsPerChunk = 2;
-		this.customBiomeDecorator.sunflowersPerChunk = 4;
-        this.customBiomeDecorator.rosesPerChunk = 20;
-        this.customBiomeDecorator.grassPerChunk = 25;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.bushesPerChunk = 10;
-		this.customBiomeDecorator.lilyflowersPerChunk = 4;
-		this.customBiomeDecorator.generatePumpkins = true;
-		this.customBiomeDecorator.generateMelons = true;
-        this.spawnableCreatureList.clear();
-		this.spawnableCreatureList.add(new SpawnListEntry(EntityRosester.class, 10, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 1;
+		customBiomeDecorator.flowersPerChunk = 20;
+		customBiomeDecorator.whiteFlowersPerChunk = 25;
+		customBiomeDecorator.tinyFlowersPerChunk = 15;
+		customBiomeDecorator.hydrangeasPerChunk = 3;
+		customBiomeDecorator.sproutsPerChunk = 2;
+		customBiomeDecorator.sunflowersPerChunk = 4;
+		customBiomeDecorator.rosesPerChunk = 20;
+		customBiomeDecorator.grassPerChunk = 25;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.bushesPerChunk = 10;
+		customBiomeDecorator.lilyflowersPerChunk = 4;
+		customBiomeDecorator.generatePumpkins = true;
+		customBiomeDecorator.generateMelons = true;
+		spawnableCreatureList.clear();
+		spawnableCreatureList.add(new SpawnListEntry(EntityRosester.class, 10, 4, 4));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return new WorldGenTallGrass(Block.tallGrass.blockID, 1);
@@ -52,11 +53,13 @@ public class BiomeGenGarden extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenGiantFlowerRed() : new WorldGenGiantFlowerYellow());
+		return par1Random.nextInt(3) == 0 ? new WorldGenGiantFlowerRed() : new WorldGenGiantFlowerYellow();
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -79,6 +82,7 @@ public class BiomeGenGarden extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 3785757;
@@ -87,6 +91,7 @@ public class BiomeGenGarden extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 5364530;

src/minecraft/biomesoplenty/biomes/BiomeGenGlacier.java

@@ -10,15 +10,15 @@ public class BiomeGenGlacier extends BiomeGenBase
 	public BiomeGenGlacier(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Blocks.hardIce.get().blockID;
-        this.fillerBlock = (byte)Blocks.hardIce.get().blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
+		spawnableCreatureList.clear();
+		topBlock = (byte)Blocks.hardIce.get().blockID;
+		fillerBlock = (byte)Blocks.hardIce.get().blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = -999;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenGrassland.java

@@ -22,33 +22,35 @@ public class BiomeGenGrassland extends BiomeGenBase
 	public BiomeGenGrassland(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = 2;
-		this.customBiomeDecorator.reedsPerChunk = 25;
-		this.customBiomeDecorator.mushroomsPerChunk = 20;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.waterLakesPerChunk = 15;
-		this.customBiomeDecorator.portobellosPerChunk = 3;
-		this.customBiomeDecorator.reedsBOPPerChunk = 3;
-		this.customBiomeDecorator.generatePumpkins = false;
-        this.spawnableCreatureList.add(new SpawnListEntry(EntitySheep.class, 14, 4, 4));
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityPig.class, 12, 4, 4));
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityChicken.class, 12, 4, 4));
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityCow.class, 10, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = 2;
+		customBiomeDecorator.reedsPerChunk = 25;
+		customBiomeDecorator.mushroomsPerChunk = 20;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.waterLakesPerChunk = 15;
+		customBiomeDecorator.portobellosPerChunk = 3;
+		customBiomeDecorator.reedsBOPPerChunk = 3;
+		customBiomeDecorator.generatePumpkins = false;
+		spawnableCreatureList.add(new SpawnListEntry(EntitySheep.class, 14, 4, 4));
+		spawnableCreatureList.add(new SpawnListEntry(EntityPig.class, 12, 4, 4));
+		spawnableCreatureList.add(new SpawnListEntry(EntityChicken.class, 12, 4, 4));
+		spawnableCreatureList.add(new SpawnListEntry(EntityCow.class, 10, 4, 4));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -71,11 +73,13 @@ public class BiomeGenGrassland extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 8379261;
 	 }
 
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 8379261;

src/minecraft/biomesoplenty/biomes/BiomeGenGrove.java

@@ -18,31 +18,33 @@ public class BiomeGenGrove extends BiomeGenBase
 	public BiomeGenGrove(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.customBiomeDecorator.treesPerChunk = 3;
-        this.customBiomeDecorator.flowersPerChunk = 5;
-		this.customBiomeDecorator.tinyFlowersPerChunk = 80;
-		this.customBiomeDecorator.whiteFlowersPerChunk = 15;
-        this.customBiomeDecorator.grassPerChunk = 8;
-		this.customBiomeDecorator.sproutsPerChunk = 1;
-		this.customBiomeDecorator.lilyflowersPerChunk = 3;
-		this.customBiomeDecorator.berryBushesPerChunk = 2;
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 3;
+		customBiomeDecorator.flowersPerChunk = 5;
+		customBiomeDecorator.tinyFlowersPerChunk = 80;
+		customBiomeDecorator.whiteFlowersPerChunk = 15;
+		customBiomeDecorator.grassPerChunk = 8;
+		customBiomeDecorator.sproutsPerChunk = 1;
+		customBiomeDecorator.lilyflowersPerChunk = 3;
+		customBiomeDecorator.berryBushesPerChunk = 2;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(2) == 0 ? new WorldGenChaparral2() : par1Random.nextInt(3) == 0 ? new WorldGenPoplar2() : new WorldGenPoplar());
+		return par1Random.nextInt(2) == 0 ? new WorldGenChaparral2() : par1Random.nextInt(3) == 0 ? new WorldGenPoplar2() : new WorldGenPoplar();
 		//return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenNorwaySpruce1() : new WorldGenNorwaySpruce2());
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
@@ -51,6 +53,7 @@ public class BiomeGenGrove extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 5341009;
@@ -59,6 +62,7 @@ public class BiomeGenGrove extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 6396257;

src/minecraft/biomesoplenty/biomes/BiomeGenHeathland.java

@@ -14,28 +14,30 @@ public class BiomeGenHeathland extends BiomeGenBase
 	public BiomeGenHeathland(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 3;
-        this.customBiomeDecorator.grassPerChunk = 10;
-        this.customBiomeDecorator.purpleFlowersPerChunk = 30;
-        this.customBiomeDecorator.deadBushPerChunk = 2;
-		this.customBiomeDecorator.berryBushesPerChunk = 1;
-		this.customBiomeDecorator.generatePumpkins = false;
+		spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 3;
+		customBiomeDecorator.grassPerChunk = 10;
+		customBiomeDecorator.purpleFlowersPerChunk = 30;
+		customBiomeDecorator.deadBushPerChunk = 2;
+		customBiomeDecorator.berryBushesPerChunk = 1;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenJacarandaShrub(0, 0) : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0, 0) : this.worldGeneratorTrees));
+		return par1Random.nextInt(3) == 0 ? new WorldGenJacarandaShrub(0, 0) : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0, 0) : worldGeneratorTrees);
 	}
 
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 13550967;
@@ -44,6 +46,7 @@ public class BiomeGenHeathland extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 11454081;

src/minecraft/biomesoplenty/biomes/BiomeGenHighland.java

@@ -9,12 +9,12 @@ public class BiomeGenHighland extends BiomeGenBase
 	public BiomeGenHighland(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-		this.customBiomeDecorator.highGrassPerChunk = 25;
-        this.customBiomeDecorator.grassPerChunk = 25;
-		this.customBiomeDecorator.potatoesPerChunk = -999;
-		this.customBiomeDecorator.generateBoulders = true;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.highGrassPerChunk = 25;
+		customBiomeDecorator.grassPerChunk = 25;
+		customBiomeDecorator.potatoesPerChunk = -999;
+		customBiomeDecorator.generateBoulders = true;
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenHillsNew.java

@@ -17,21 +17,23 @@ public class BiomeGenHillsNew extends BiomeGenBase
 	public BiomeGenHillsNew(int par1)
 	{
 		super(par1);
-		this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.customBiomeDecorator.treesPerChunk = 1;
-		this.customBiomeDecorator.violetsPerChunk = 5;
-        this.theWorldGenerator = new WorldGenMinable(Block.silverfish.blockID, 8);
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 1;
+		customBiomeDecorator.violetsPerChunk = 5;
+		theWorldGenerator = new WorldGenMinable(Block.silverfish.blockID, 8);
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenJacaranda(false) : this.worldGeneratorTrees);
+		return par1Random.nextInt(3) == 0 ? new WorldGenJacaranda(false) : worldGeneratorTrees;
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -58,7 +60,7 @@ public class BiomeGenHillsNew extends BiomeGenBase
 			var6 = par3 + par2Random.nextInt(16);
 			var7 = par2Random.nextInt(64);
 			var8 = par4 + par2Random.nextInt(16);
-            this.theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
+			theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
 		}
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenHotSprings.java

@@ -15,22 +15,23 @@ public class BiomeGenHotSprings extends BiomeGenBase
 	public BiomeGenHotSprings(int par1)
 	{
 		super(par1);
-		this.topBlock = (byte)Block.stone.blockID;
-        this.fillerBlock = (byte)Block.stone.blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 3;
-        this.customBiomeDecorator.grassPerChunk = -999;
-		this.customBiomeDecorator.outbackPerChunk = 5;
-		this.customBiomeDecorator.hotSpringsPerChunk = 25;
-		this.customBiomeDecorator.lavaLakesPerChunk = 5;
+		topBlock = (byte)Block.stone.blockID;
+		fillerBlock = (byte)Block.stone.blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 3;
+		customBiomeDecorator.grassPerChunk = -999;
+		customBiomeDecorator.outbackPerChunk = 5;
+		customBiomeDecorator.hotSpringsPerChunk = 25;
+		customBiomeDecorator.lavaLakesPerChunk = 5;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenPineTree() : new WorldGenTaiga6(false));
+		return par1Random.nextInt(3) == 0 ? new WorldGenPineTree() : new WorldGenTaiga6(false);
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenIcyHills.java

@@ -19,20 +19,21 @@ public class BiomeGenIcyHills extends BiomeGenBase
 	public BiomeGenIcyHills(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Block.blockSnow.blockID;
-        this.fillerBlock = (byte)Block.blockSnow.blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 2;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = -999;
-		this.spawnableCreatureList.add(new SpawnListEntry(EntitySnowman.class, 30, 2, 4));
+		spawnableCreatureList.clear();
+		topBlock = (byte)Block.blockSnow.blockID;
+		fillerBlock = (byte)Block.blockSnow.blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 2;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = -999;
+		spawnableCreatureList.add(new SpawnListEntry(EntitySnowman.class, 30, 2, 4));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		return new WorldGenIceTree(false);
@@ -41,12 +42,11 @@ public class BiomeGenIcyHills extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 16777215;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenJadeCliffs.java

@@ -18,20 +18,22 @@ public class BiomeGenJadeCliffs extends BiomeGenBase
 	public BiomeGenJadeCliffs(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 12;
-        this.customBiomeDecorator.grassPerChunk = 3;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 12;
+		customBiomeDecorator.grassPerChunk = 3;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(4) == 0 ? new WorldGenShrub(0, 1) : new WorldGenPineTree());
+		return par1Random.nextInt(4) == 0 ? new WorldGenShrub(0, 1) : new WorldGenPineTree();
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -54,12 +56,11 @@ public class BiomeGenJadeCliffs extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 12045485;
-		}	
 		else
 		{
 			par1 /= 3.0F;
@@ -81,6 +82,7 @@ public class BiomeGenJadeCliffs extends BiomeGenBase
 	 /**
 	  * Provides the basic grass color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 8168808;
@@ -89,6 +91,7 @@ public class BiomeGenJadeCliffs extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 9096298;

src/minecraft/biomesoplenty/biomes/BiomeGenJungleNew.java

@@ -24,37 +24,40 @@ public class BiomeGenJungleNew extends BiomeGenBase
 	public BiomeGenJungleNew(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 45;
-        this.customBiomeDecorator.grassPerChunk = 25;
-        this.customBiomeDecorator.flowersPerChunk = 4;
-		this.customBiomeDecorator.orangeFlowersPerChunk = 5;
-		this.customBiomeDecorator.poisonIvyPerChunk = 1;
-		this.customBiomeDecorator.generateMelons = true;
-		this.waterColorMultiplier = 10745289;
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1));
-		this.spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityChicken.class, 10, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 45;
+		customBiomeDecorator.grassPerChunk = 25;
+		customBiomeDecorator.flowersPerChunk = 4;
+		customBiomeDecorator.orangeFlowersPerChunk = 5;
+		customBiomeDecorator.poisonIvyPerChunk = 1;
+		customBiomeDecorator.generateMelons = true;
+		waterColorMultiplier = 10745289;
+		spawnableMonsterList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1));
+		spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
+		spawnableCreatureList.add(new SpawnListEntry(EntityChicken.class, 10, 4, 4));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		//return (WorldGenerator)(par1Random.nextInt(5) == 0 ? new WorldGenBrazilNut1() : (par1Random.nextInt(10) == 0 ? new WorldGenSandboxTree1() : (par1Random.nextInt(2) == 0 ? new WorldGenBrazilNut2() : (par1Random.nextInt(3) == 0 ? new WorldGenSandboxTree2() : new WorldGenShrub(3, 0)))));
-		return (WorldGenerator)(par1Random.nextInt(10) == 0 ? this.worldGeneratorBigTree : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(3, 0) : (par1Random.nextInt(3) == 0 ? new WorldGenHugeTrees(false, 10 + par1Random.nextInt(20), 3, 3) : new WorldGenTrees(false, 4 + par1Random.nextInt(7), 3, 3, true))));
+		return par1Random.nextInt(10) == 0 ? worldGeneratorBigTree : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(3, 0) : (par1Random.nextInt(3) == 0 ? new WorldGenHugeTrees(false, 10 + par1Random.nextInt(20), 3, 3) : new WorldGenTrees(false, 4 + par1Random.nextInt(7), 3, 3, true)));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -72,6 +75,7 @@ public class BiomeGenJungleNew extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 5232218;
@@ -80,6 +84,7 @@ public class BiomeGenJungleNew extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 3266623;

src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java

@@ -18,35 +18,37 @@ public class BiomeGenLushDesert extends BiomeGenBase
 	public BiomeGenLushDesert(int par1)
 	{
 		super(par1);
-        this.topBlock = (byte)Blocks.redRock.get().blockID;
-        this.fillerBlock = (byte)Blocks.redRock.get().blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 12;
-        this.customBiomeDecorator.grassPerChunk = 8;
-        this.customBiomeDecorator.oasesPerChunk = 999;
-        this.customBiomeDecorator.oasesPerChunk2 = 999;
-        this.customBiomeDecorator.deadBushPerChunk = 2;
-        this.customBiomeDecorator.purpleFlowersPerChunk = 5;
-        this.customBiomeDecorator.desertGrassPerChunk = 10;
-		this.customBiomeDecorator.desertCactiPerChunk = 10;
-        this.customBiomeDecorator.cactiPerChunk = 20;
-		this.customBiomeDecorator.tinyCactiPerChunk = 5;
-		this.customBiomeDecorator.waterLakesPerChunk = 5;
-		this.customBiomeDecorator.aloePerChunk = 3;
-        this.customBiomeDecorator.generateGrass = true;
-        this.customBiomeDecorator.generateSand = true;
-		this.customBiomeDecorator.generatePumpkins = false;
+		topBlock = (byte)Blocks.redRock.get().blockID;
+		fillerBlock = (byte)Blocks.redRock.get().blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 12;
+		customBiomeDecorator.grassPerChunk = 8;
+		customBiomeDecorator.oasesPerChunk = 999;
+		customBiomeDecorator.oasesPerChunk2 = 999;
+		customBiomeDecorator.deadBushPerChunk = 2;
+		customBiomeDecorator.purpleFlowersPerChunk = 5;
+		customBiomeDecorator.desertGrassPerChunk = 10;
+		customBiomeDecorator.desertCactiPerChunk = 10;
+		customBiomeDecorator.cactiPerChunk = 20;
+		customBiomeDecorator.tinyCactiPerChunk = 5;
+		customBiomeDecorator.waterLakesPerChunk = 5;
+		customBiomeDecorator.aloePerChunk = 3;
+		customBiomeDecorator.generateGrass = true;
+		customBiomeDecorator.generateSand = true;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
-		return (WorldGenerator)(par1Random.nextInt(4) == 0 ? new WorldGenAcacia(false) : (par1Random.nextInt(24) == 0 ? new WorldGenDeadTree3(false) : (par1Random.nextInt(2) == 0 ? this.worldGeneratorTrees : new WorldGenShrub(0,0))));
+		 return par1Random.nextInt(4) == 0 ? new WorldGenAcacia(false) : (par1Random.nextInt(24) == 0 ? new WorldGenDeadTree3(false) : (par1Random.nextInt(2) == 0 ? worldGeneratorTrees : new WorldGenShrub(0,0)));
 	 }
 
+	 @Override
 	 public void decorate(World par1World, Random par2Random, int par3, int par4)
 	 {
 		 super.decorate(par1World, par2Random, par3, par4);

src/minecraft/biomesoplenty/biomes/BiomeGenLushSwamp.java

@@ -18,29 +18,31 @@ public class BiomeGenLushSwamp extends BiomeGenBase
 	public BiomeGenLushSwamp(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 10;
-		this.customBiomeDecorator.grassPerChunk = 4;
-        this.customBiomeDecorator.mushroomsPerChunk = 8;
-        this.customBiomeDecorator.reedsPerChunk = 16;
-		this.customBiomeDecorator.cattailsPerChunk = 10;
-		this.customBiomeDecorator.highCattailsPerChunk = 5;
-        this.customBiomeDecorator.waterlilyPerChunk = 3;
-		this.customBiomeDecorator.hydrangeasPerChunk = 1;
-		this.customBiomeDecorator.reedsBOPPerChunk = 5;
-		this.customBiomeDecorator.poisonWaterPerChunk = 2;
-		this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 10;
+		customBiomeDecorator.grassPerChunk = 4;
+		customBiomeDecorator.mushroomsPerChunk = 8;
+		customBiomeDecorator.reedsPerChunk = 16;
+		customBiomeDecorator.cattailsPerChunk = 10;
+		customBiomeDecorator.highCattailsPerChunk = 5;
+		customBiomeDecorator.waterlilyPerChunk = 3;
+		customBiomeDecorator.hydrangeasPerChunk = 1;
+		customBiomeDecorator.reedsBOPPerChunk = 5;
+		customBiomeDecorator.poisonWaterPerChunk = 2;
+		spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		return new WorldGenSwampTall();
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);

src/minecraft/biomesoplenty/biomes/BiomeGenMangrove.java

@@ -15,25 +15,26 @@ public class BiomeGenMangrove extends BiomeGenBase
 	public BiomeGenMangrove(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Block.sand.blockID;
-        this.fillerBlock = (byte)Block.sand.blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 6;
-        this.customBiomeDecorator.deadBushPerChunk = 1;
-		this.customBiomeDecorator.deadGrassPerChunk = 9;
-        this.customBiomeDecorator.reedsPerChunk = -999;
-        this.customBiomeDecorator.cactiPerChunk = -999;
-		this.customBiomeDecorator.desertSproutsPerChunk = 1;
-		this.customBiomeDecorator.waterLakesPerChunk = 10;
+		spawnableCreatureList.clear();
+		topBlock = (byte)Block.sand.blockID;
+		fillerBlock = (byte)Block.sand.blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 6;
+		customBiomeDecorator.deadBushPerChunk = 1;
+		customBiomeDecorator.deadGrassPerChunk = 9;
+		customBiomeDecorator.reedsPerChunk = -999;
+		customBiomeDecorator.cactiPerChunk = -999;
+		customBiomeDecorator.desertSproutsPerChunk = 1;
+		customBiomeDecorator.waterLakesPerChunk = 10;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenMangrove2(0,0) : new WorldGenMangrove(false));
+		 return par1Random.nextInt(3) == 0 ? new WorldGenMangrove2(0,0) : new WorldGenMangrove(false);
 	 }
 }

src/minecraft/biomesoplenty/biomes/BiomeGenMapleWoods.java

@@ -14,19 +14,20 @@ public class BiomeGenMapleWoods extends BiomeGenBase
 	public BiomeGenMapleWoods(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 9;
-        this.customBiomeDecorator.grassPerChunk = 1;
-		this.customBiomeDecorator.violetsPerChunk = 1;
-		this.customBiomeDecorator.poisonIvyPerChunk = 1;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 9;
+		customBiomeDecorator.grassPerChunk = 1;
+		customBiomeDecorator.violetsPerChunk = 1;
+		customBiomeDecorator.poisonIvyPerChunk = 1;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(6) == 0 ? new WorldGenTaiga5(false) : new WorldGenMaple(false));
+		return par1Random.nextInt(6) == 0 ? new WorldGenTaiga5(false) : new WorldGenMaple(false);
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java

@@ -19,18 +19,19 @@ public class BiomeGenMarsh extends BiomeGenBase
 	public BiomeGenMarsh(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = 65;
-		this.customBiomeDecorator.highGrassPerChunk = 25;
-		this.customBiomeDecorator.generatePumpkins = false;
-		this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = 65;
+		customBiomeDecorator.highGrassPerChunk = 25;
+		customBiomeDecorator.generatePumpkins = false;
+		spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -48,6 +49,7 @@ public class BiomeGenMarsh extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	 {
 		 return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);

src/minecraft/biomesoplenty/biomes/BiomeGenMeadow.java

@@ -16,28 +16,30 @@ public class BiomeGenMeadow extends BiomeGenBase
 	public BiomeGenMeadow(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 2;
-        this.customBiomeDecorator.grassPerChunk = 10;
-		this.customBiomeDecorator.tinyFlowersPerChunk = 14;
-		this.customBiomeDecorator.flowersPerChunk = 10;
-		this.customBiomeDecorator.carrotsPerChunk = -999;
-		this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.hydrangeasPerChunk = 3;
-		this.customBiomeDecorator.sunflowersPerChunk = 1;
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 2;
+		customBiomeDecorator.grassPerChunk = 10;
+		customBiomeDecorator.tinyFlowersPerChunk = 14;
+		customBiomeDecorator.flowersPerChunk = 10;
+		customBiomeDecorator.carrotsPerChunk = -999;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.hydrangeasPerChunk = 3;
+		customBiomeDecorator.sunflowersPerChunk = 1;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenTaiga2(false) : new WorldGenShrub(0, 1));
+		return par1Random.nextInt(3) == 0 ? new WorldGenTaiga2(false) : new WorldGenShrub(0, 1);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -60,11 +62,13 @@ public class BiomeGenMeadow extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 6533741;
 	 }
 
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 6533741;

src/minecraft/biomesoplenty/biomes/BiomeGenMesa.java

@@ -16,27 +16,26 @@ public class BiomeGenMesa extends BiomeGenBase
 	public BiomeGenMesa(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Blocks.redRock.get().blockID;
-        this.fillerBlock = (byte)Blocks.redRock.get().blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.deadBushPerChunk = 2;
-        this.customBiomeDecorator.desertGrassPerChunk = 10;
-		this.customBiomeDecorator.tinyCactiPerChunk = 2;
-        this.spawnableMonsterList.add(new SpawnListEntry(EntitySpider.class, 15, 2, 6));
+		spawnableCreatureList.clear();
+		topBlock = (byte)Blocks.redRock.get().blockID;
+		fillerBlock = (byte)Blocks.redRock.get().blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.deadBushPerChunk = 2;
+		customBiomeDecorator.desertGrassPerChunk = 10;
+		customBiomeDecorator.tinyCactiPerChunk = 2;
+		spawnableMonsterList.add(new SpawnListEntry(EntitySpider.class, 15, 2, 6));
 	}
 
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 15898486;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java

@@ -17,20 +17,20 @@ public class BiomeGenMoor extends BiomeGenBase
 	public BiomeGenMoor(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = 15;
-		this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.mudPerChunk = 1;
-        this.customBiomeDecorator.mudPerChunk2 = 1;
-		this.customBiomeDecorator.waterLakesPerChunk = 10;
-		this.waterColorMultiplier = 5800566;
-		this.customBiomeDecorator.generatePumpkins = false;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = 15;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.mudPerChunk = 1;
+		customBiomeDecorator.mudPerChunk2 = 1;
+		customBiomeDecorator.waterLakesPerChunk = 10;
+		waterColorMultiplier = 5800566;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	//public void decorate(World par1World, Random par2Random, int par3, int par4)
@@ -50,6 +50,7 @@ public class BiomeGenMoor extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1)));
@@ -58,11 +59,13 @@ public class BiomeGenMoor extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 6394725;
 	}
 
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 6394725;
@@ -71,12 +74,11 @@ public class BiomeGenMoor extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 10536403;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenMountain.java

@@ -13,18 +13,19 @@ public class BiomeGenMountain extends BiomeGenBase
 	public BiomeGenMountain(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 2;
-        this.customBiomeDecorator.grassPerChunk = 3;
-		this.customBiomeDecorator.berryBushesPerChunk = 3;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 2;
+		customBiomeDecorator.grassPerChunk = 3;
+		customBiomeDecorator.berryBushesPerChunk = 3;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(4) == 0 ? this.worldGeneratorTrees : new WorldGenPineTree());
+		return par1Random.nextInt(4) == 0 ? worldGeneratorTrees : new WorldGenPineTree();
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenMysticGrove.java

@@ -21,40 +21,42 @@ public class BiomeGenMysticGrove extends BiomeGenBase
 	public BiomeGenMysticGrove(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 8;
-        this.customBiomeDecorator.grassPerChunk = 7;
-        this.customBiomeDecorator.flowersPerChunk = 8;
-		this.customBiomeDecorator.pinkFlowersPerChunk = 6;
-        this.customBiomeDecorator.glowFlowersPerChunk = 15;
-        this.customBiomeDecorator.rosesPerChunk = 8;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.sproutsPerChunk = 3;
-		this.customBiomeDecorator.hydrangeasPerChunk = 3;
-		this.customBiomeDecorator.blueMilksPerChunk = 4;
-		this.customBiomeDecorator.glowshroomsPerChunk = 2;
-		this.customBiomeDecorator.lilyflowersPerChunk = 3;
-		this.customBiomeDecorator.hotSpringsPerChunk = 2;
-        this.waterColorMultiplier = 15349914;
-		this.spawnableMonsterList.clear();
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-		this.spawnableMonsterList.add(new SpawnListEntry(EntityWitch.class, 10, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 8;
+		customBiomeDecorator.grassPerChunk = 7;
+		customBiomeDecorator.flowersPerChunk = 8;
+		customBiomeDecorator.pinkFlowersPerChunk = 6;
+		customBiomeDecorator.glowFlowersPerChunk = 15;
+		customBiomeDecorator.rosesPerChunk = 8;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.sproutsPerChunk = 3;
+		customBiomeDecorator.hydrangeasPerChunk = 3;
+		customBiomeDecorator.blueMilksPerChunk = 4;
+		customBiomeDecorator.glowshroomsPerChunk = 2;
+		customBiomeDecorator.lilyflowersPerChunk = 3;
+		customBiomeDecorator.hotSpringsPerChunk = 2;
+		waterColorMultiplier = 15349914;
+		spawnableMonsterList.clear();
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableMonsterList.add(new SpawnListEntry(EntityWitch.class, 10, 4, 4));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(5) == 0 ? new WorldGenMystic2(false) : new WorldGenMystic1(false));
+		return par1Random.nextInt(5) == 0 ? new WorldGenMystic2(false) : new WorldGenMystic1(false);
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
@@ -63,6 +65,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 7004860;
@@ -71,6 +74,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 3530896;
@@ -79,12 +83,11 @@ public class BiomeGenMysticGrove extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 16751558;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenNetherBase.java

@@ -14,16 +14,16 @@ public class BiomeGenNetherBase extends BiomeGenBase
 	public BiomeGenNetherBase(int par1)
 	{
 		super(par1);
-		this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Block.netherrack.blockID;
-        this.fillerBlock = (byte)Block.netherrack.blockID;
-        this.spawnableMonsterList.clear();
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.spawnableCaveCreatureList.clear();
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Block.netherrack.blockID;
+		fillerBlock = (byte)Block.netherrack.blockID;
+		spawnableMonsterList.clear();
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableCaveCreatureList.clear();
+		spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
+		spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
+		spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4));
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenNetherBone.java

@@ -1,16 +1,11 @@
 package biomesoplenty.biomes;
 
-import java.util.Random;
-
-import biomesoplenty.worldgen.WorldGenBoneSpine;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntityGhast;
 import net.minecraft.entity.monster.EntityMagmaCube;
 import net.minecraft.entity.monster.EntityPigZombie;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.SpawnListEntry;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 public class BiomeGenNetherBone extends BiomeGenBase
 {
@@ -19,18 +14,18 @@ public class BiomeGenNetherBone extends BiomeGenBase
 	public BiomeGenNetherBone(int par1)
 	{
 		super(par1);
-		this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Block.netherrack.blockID;
-        this.fillerBlock = (byte)Block.netherrack.blockID;
-		this.customBiomeDecorator.boneSpinesPerChunk = 6;
-		this.customBiomeDecorator.boneSpines2PerChunk = 9;
-        this.spawnableMonsterList.clear();
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.spawnableCaveCreatureList.clear();
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Block.netherrack.blockID;
+		fillerBlock = (byte)Block.netherrack.blockID;
+		customBiomeDecorator.boneSpinesPerChunk = 6;
+		customBiomeDecorator.boneSpines2PerChunk = 9;
+		spawnableMonsterList.clear();
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableCaveCreatureList.clear();
+		spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
+		spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
+		spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4));
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenNetherDesert.java

@@ -14,18 +14,18 @@ public class BiomeGenNetherDesert extends BiomeGenBase
 	public BiomeGenNetherDesert(int par1)
 	{
 		super(par1);
-		this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Block.slowSand.blockID;
-        this.fillerBlock = (byte)Block.slowSand.blockID;
-		this.customBiomeDecorator.thornsPerChunk = 10;
-		this.customBiomeDecorator.tinyCactiPerChunk = 3;
-        this.spawnableMonsterList.clear();
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.spawnableCaveCreatureList.clear();
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Block.slowSand.blockID;
+		fillerBlock = (byte)Block.slowSand.blockID;
+		customBiomeDecorator.thornsPerChunk = 10;
+		customBiomeDecorator.tinyCactiPerChunk = 3;
+		spawnableMonsterList.clear();
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableCaveCreatureList.clear();
+		spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
+		spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
+		spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4));
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenNetherGarden.java

@@ -18,30 +18,31 @@ public class BiomeGenNetherGarden extends BiomeGenBase
 	public BiomeGenNetherGarden(int par1)
 	{
 		super(par1);
-		this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Block.netherrack.blockID;
-        this.fillerBlock = (byte)Block.netherrack.blockID;
-		this.customBiomeDecorator.treesPerChunk = 80;
-		this.customBiomeDecorator.netherVinesPerChunk = 60;
-		this.customBiomeDecorator.mushroomsPerChunk = 30;
-		this.customBiomeDecorator.bigMushroomsPerChunk = 30;
-		this.customBiomeDecorator.netherWartPerChunk = 3;
-		this.customBiomeDecorator.netherGrassPerChunk = 10;
-		this.customBiomeDecorator.glowshroomsPerChunk = 3;
-		this.customBiomeDecorator.toadstoolsPerChunk = 5;
-        this.spawnableMonsterList.clear();
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.spawnableCaveCreatureList.clear();
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Block.netherrack.blockID;
+		fillerBlock = (byte)Block.netherrack.blockID;
+		customBiomeDecorator.treesPerChunk = 80;
+		customBiomeDecorator.netherVinesPerChunk = 60;
+		customBiomeDecorator.mushroomsPerChunk = 30;
+		customBiomeDecorator.bigMushroomsPerChunk = 30;
+		customBiomeDecorator.netherWartPerChunk = 3;
+		customBiomeDecorator.netherGrassPerChunk = 10;
+		customBiomeDecorator.glowshroomsPerChunk = 3;
+		customBiomeDecorator.toadstoolsPerChunk = 5;
+		spawnableMonsterList.clear();
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableCaveCreatureList.clear();
+		spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
+		spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
+		spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
 		 return new WorldGenNetherMushroom();

src/minecraft/biomesoplenty/biomes/BiomeGenNetherLava.java

@@ -21,32 +21,34 @@ public class BiomeGenNetherLava extends BiomeGenBase
 	public BiomeGenNetherLava(int par1)
 	{
 		super(par1);
-		this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Block.netherrack.blockID;
-        this.fillerBlock = (byte)Block.netherrack.blockID;
-		this.customBiomeDecorator.grassPerChunk = 8;
-		this.customBiomeDecorator.netherLavaPerChunk = 20;
-		this.customBiomeDecorator.smolderingGrassPerChunk = 2;
-		this.customBiomeDecorator.generateAsh = true;
-        this.spawnableMonsterList.clear();
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.spawnableCaveCreatureList.clear();
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 4, 4, 4));
-		this.theWorldGenerator = new WorldGenLavaSpring(Block.lavaMoving.blockID, 4);
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Block.netherrack.blockID;
+		fillerBlock = (byte)Block.netherrack.blockID;
+		customBiomeDecorator.grassPerChunk = 8;
+		customBiomeDecorator.netherLavaPerChunk = 20;
+		customBiomeDecorator.smolderingGrassPerChunk = 2;
+		customBiomeDecorator.generateAsh = true;
+		spawnableMonsterList.clear();
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableCaveCreatureList.clear();
+		spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
+		spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
+		spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 4, 4, 4));
+		theWorldGenerator = new WorldGenLavaSpring(Block.lavaMoving.blockID, 4);
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	 {
 		 return new WorldGenFire();
 	 }
 
+	 @Override
 	 public void decorate(World par1World, Random par2Random, int par3, int par4)
 	 {
 		 super.decorate(par1World, par2Random, par3, par4);
@@ -60,7 +62,7 @@ public class BiomeGenNetherLava extends BiomeGenBase
 			 var6 = par3 + par2Random.nextInt(16);
 			 var7 = 64 + par2Random.nextInt(64);
 			 var8 = par4 + par2Random.nextInt(16);
-            this.theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
+			 theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
 		 }
 	 }
 }

src/minecraft/biomesoplenty/biomes/BiomeGenOasis.java

@@ -14,30 +14,31 @@ public class BiomeGenOasis extends BiomeGenBase
 	public BiomeGenOasis(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Block.sand.blockID;
-        this.fillerBlock = (byte)Block.sand.blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 3;
-        this.customBiomeDecorator.grassPerChunk = 15;
-        this.customBiomeDecorator.reedsPerChunk = 100;
-        this.customBiomeDecorator.oasesPerChunk = 999;
-        this.customBiomeDecorator.oasesPerChunk2 = 999;
-		this.customBiomeDecorator.cactiPerChunk = 7;
-		this.customBiomeDecorator.desertSproutsPerChunk = 3;
-		this.customBiomeDecorator.tinyCactiPerChunk = 2;
-		this.customBiomeDecorator.generatePumpkins = false;
-		this.customBiomeDecorator.generateMelons = true;
-		this.customBiomeDecorator.generateQuicksand = true;
-		this.customBiomeDecorator.waterLakesPerChunk = 10;
-		this.customBiomeDecorator.aloePerChunk = 4;
-		this.customBiomeDecorator.hotSpringsPerChunk = 2;
+		spawnableCreatureList.clear();
+		topBlock = (byte)Block.sand.blockID;
+		fillerBlock = (byte)Block.sand.blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 3;
+		customBiomeDecorator.grassPerChunk = 15;
+		customBiomeDecorator.reedsPerChunk = 100;
+		customBiomeDecorator.oasesPerChunk = 999;
+		customBiomeDecorator.oasesPerChunk2 = 999;
+		customBiomeDecorator.cactiPerChunk = 7;
+		customBiomeDecorator.desertSproutsPerChunk = 3;
+		customBiomeDecorator.tinyCactiPerChunk = 2;
+		customBiomeDecorator.generatePumpkins = false;
+		customBiomeDecorator.generateMelons = true;
+		customBiomeDecorator.generateQuicksand = true;
+		customBiomeDecorator.waterLakesPerChunk = 10;
+		customBiomeDecorator.aloePerChunk = 4;
+		customBiomeDecorator.hotSpringsPerChunk = 2;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
 		 return new WorldGenPalmTree3();

src/minecraft/biomesoplenty/biomes/BiomeGenOceanCoral.java

@@ -7,6 +7,6 @@ public class BiomeGenOceanCoral extends BiomeGenBase
 	public BiomeGenOceanCoral(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
+		spawnableCreatureList.clear();
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenOceanKelp.java

@@ -14,16 +14,17 @@ public class BiomeGenOceanKelp extends BiomeGenBase
 	public BiomeGenOceanKelp(int par1)
 	{
 		super(par1);
-		this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.customBiomeDecorator.grassPerChunk = 50;
-        this.spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.grassPerChunk = 50;
+		spawnableCreatureList.clear();
 	}
 
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return new WorldGenTallGrass(Blocks.coral.get().blockID, 0);

src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoods.java

@@ -24,41 +24,43 @@ public class BiomeGenOminousWoods extends BiomeGenBase
 	public BiomeGenOminousWoods(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 10;
-        this.customBiomeDecorator.grassPerChunk = 1;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.deathbloomsPerChunk = 1;
-        this.customBiomeDecorator.mushroomsPerChunk = 8;
-        this.customBiomeDecorator.reedsPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-        this.customBiomeDecorator.thornsPerChunk = 9;
-		this.customBiomeDecorator.poisonIvyPerChunk = 3;
-		this.customBiomeDecorator.poisonWaterPerChunk = 15;
-        this.waterColorMultiplier = 1973030;
-		this.spawnableMonsterList.clear();
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityCaveSpider.class, 5, 1, 2));
-        this.spawnableMonsterList.add(new SpawnListEntry(EntitySpider.class, 7, 1, 2));
-		this.spawnableMonsterList.add(new SpawnListEntry(EntityEnderman.class, 10, 1, 4));
-		this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityBat.class, 10, 8, 8));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 10;
+		customBiomeDecorator.grassPerChunk = 1;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.deathbloomsPerChunk = 1;
+		customBiomeDecorator.mushroomsPerChunk = 8;
+		customBiomeDecorator.reedsPerChunk = -999;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.thornsPerChunk = 9;
+		customBiomeDecorator.poisonIvyPerChunk = 3;
+		customBiomeDecorator.poisonWaterPerChunk = 15;
+		waterColorMultiplier = 1973030;
+		spawnableMonsterList.clear();
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableMonsterList.add(new SpawnListEntry(EntityCaveSpider.class, 5, 1, 2));
+		spawnableMonsterList.add(new SpawnListEntry(EntitySpider.class, 7, 1, 2));
+		spawnableMonsterList.add(new SpawnListEntry(EntityEnderman.class, 10, 1, 4));
+		spawnableCaveCreatureList.add(new SpawnListEntry(EntityBat.class, 10, 8, 8));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		//return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenWillow2() : (par1Random.nextInt(7) == 0 ? new WorldGenDarkTree1() : (par1Random.nextInt(5) == 0 ? new WorldGenWillow1() : new WorldGenDarkTree2())));
-		return (WorldGenerator)(par1Random.nextInt(2) == 0 ? new WorldGenOminous1(false) : new WorldGenOminous2());
+		return par1Random.nextInt(2) == 0 ? new WorldGenOminous1(false) : new WorldGenOminous2();
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(6) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
@@ -67,6 +69,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 4145489;
@@ -75,6 +78,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 4145489;
@@ -83,12 +87,11 @@ public class BiomeGenOminousWoods extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 5069168;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenOrchard.java

@@ -13,22 +13,23 @@ public class BiomeGenOrchard extends BiomeGenBase
 	public BiomeGenOrchard(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 2;
-        this.customBiomeDecorator.flowersPerChunk = 20;
-        this.customBiomeDecorator.whiteFlowersPerChunk = 20;
-        this.customBiomeDecorator.tinyFlowersPerChunk = 20;
-        this.customBiomeDecorator.grassPerChunk = 15;
-		this.customBiomeDecorator.portobellosPerChunk = 2;
-		this.customBiomeDecorator.sunflowersPerChunk = 1;
-		this.customBiomeDecorator.lilyflowersPerChunk = 2;
-		this.customBiomeDecorator.berryBushesPerChunk = 3;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 2;
+		customBiomeDecorator.flowersPerChunk = 20;
+		customBiomeDecorator.whiteFlowersPerChunk = 20;
+		customBiomeDecorator.tinyFlowersPerChunk = 20;
+		customBiomeDecorator.grassPerChunk = 15;
+		customBiomeDecorator.portobellosPerChunk = 2;
+		customBiomeDecorator.sunflowersPerChunk = 1;
+		customBiomeDecorator.lilyflowersPerChunk = 2;
+		customBiomeDecorator.berryBushesPerChunk = 3;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		//return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenAppleTree1() : new WorldGenAppleTree2());
@@ -38,11 +39,13 @@ public class BiomeGenOrchard extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 14024557;
 	}
 
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 14024557;

src/minecraft/biomesoplenty/biomes/BiomeGenOriginValley.java

@@ -16,20 +16,21 @@ public class BiomeGenOriginValley extends BiomeGenBase
 	public BiomeGenOriginValley(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Blocks.originGrass.get().blockID;
-        this.customBiomeDecorator.treesPerChunk = 4;
-        this.customBiomeDecorator.grassPerChunk = -999;
-		this.customBiomeDecorator.generatePumpkins = false;
-		this.customBiomeDecorator.sandPerChunk = 0;
-		this.customBiomeDecorator.sandPerChunk2 = 0;
-        this.customBiomeDecorator.clayPerChunk = 0;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Blocks.originGrass.get().blockID;
+		customBiomeDecorator.treesPerChunk = 4;
+		customBiomeDecorator.grassPerChunk = -999;
+		customBiomeDecorator.generatePumpkins = false;
+		customBiomeDecorator.sandPerChunk = 0;
+		customBiomeDecorator.sandPerChunk2 = 0;
+		customBiomeDecorator.clayPerChunk = 0;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		return new WorldGenOriginTree(false);
@@ -38,6 +39,7 @@ public class BiomeGenOriginValley extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 10682207;
@@ -46,6 +48,7 @@ public class BiomeGenOriginValley extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 3866368;
@@ -54,12 +57,11 @@ public class BiomeGenOriginValley extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 8703228;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenOutback.java

@@ -15,25 +15,26 @@ public class BiomeGenOutback extends BiomeGenBase
 	public BiomeGenOutback(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Blocks.hardSand.get().blockID;
-        this.fillerBlock = (byte)Blocks.hardSand.get().blockID;
-        this.customBiomeDecorator.treesPerChunk = 3;
-		this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.outbackPerChunk = 10;
-        this.customBiomeDecorator.deadBushPerChunk = 7;
-		this.customBiomeDecorator.tinyCactiPerChunk = 2;
-		this.customBiomeDecorator.bushesPerChunk = 5;
-		this.customBiomeDecorator.generatePumpkins = false;
+		spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Blocks.hardSand.get().blockID;
+		fillerBlock = (byte)Blocks.hardSand.get().blockID;
+		customBiomeDecorator.treesPerChunk = 3;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.outbackPerChunk = 10;
+		customBiomeDecorator.deadBushPerChunk = 7;
+		customBiomeDecorator.tinyCactiPerChunk = 2;
+		customBiomeDecorator.bushesPerChunk = 5;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenOutbackShrub(0,0) : new WorldGenOutbackTree());
+		return par1Random.nextInt(3) == 0 ? new WorldGenOutbackShrub(0,0) : new WorldGenOutbackTree();
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenPasture.java

@@ -14,17 +14,18 @@ public class BiomeGenPasture extends BiomeGenBase
 	public BiomeGenPasture(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 0;
-        this.customBiomeDecorator.grassPerChunk = 999;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-		this.spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 0;
+		customBiomeDecorator.grassPerChunk = 999;
+		customBiomeDecorator.flowersPerChunk = -999;
+		spawnableCreatureList.clear();
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return new WorldGenTallGrass(Blocks.plants.get().blockID, 6);
@@ -33,14 +34,16 @@ public class BiomeGenPasture extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return this.worldGeneratorBigTree;
+		return worldGeneratorBigTree;
 	}
 
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 13166666;
@@ -49,6 +52,7 @@ public class BiomeGenPasture extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 13166666;

src/minecraft/biomesoplenty/biomes/BiomeGenPlainsNew.java

@@ -15,19 +15,20 @@ public class BiomeGenPlainsNew extends BiomeGenBase
 	public BiomeGenPlainsNew(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.flowersPerChunk = 4;
-        this.customBiomeDecorator.grassPerChunk = 10;
-		this.customBiomeDecorator.tinyFlowersPerChunk = 1;
-		this.customBiomeDecorator.portobellosPerChunk = 1;
-		this.customBiomeDecorator.sunflowersPerChunk = 2;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.flowersPerChunk = 4;
+		customBiomeDecorator.grassPerChunk = 10;
+		customBiomeDecorator.tinyFlowersPerChunk = 1;
+		customBiomeDecorator.portobellosPerChunk = 1;
+		customBiomeDecorator.sunflowersPerChunk = 2;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);

src/minecraft/biomesoplenty/biomes/BiomeGenPolar.java

@@ -9,14 +9,14 @@ public class BiomeGenPolar extends BiomeGenBase
 	public BiomeGenPolar(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.waterColorMultiplier = 3685739;
+		spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = -999;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		waterColorMultiplier = 3685739;
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenPrairie.java

@@ -16,18 +16,19 @@ public class BiomeGenPrairie extends BiomeGenBase
 	public BiomeGenPrairie(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 1;
-        this.customBiomeDecorator.grassPerChunk = 999;
-        this.customBiomeDecorator.whiteFlowersPerChunk = 45;
-		this.customBiomeDecorator.portobellosPerChunk = 2;
-		this.customBiomeDecorator.berryBushesPerChunk = 2;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 1;
+		customBiomeDecorator.grassPerChunk = 999;
+		customBiomeDecorator.whiteFlowersPerChunk = 45;
+		customBiomeDecorator.portobellosPerChunk = 2;
+		customBiomeDecorator.berryBushesPerChunk = 2;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		return new WorldGenPrairie(false);
@@ -36,6 +37,7 @@ public class BiomeGenPrairie extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1)));

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java

@@ -23,29 +23,29 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
 	public BiomeGenPromisedLandForest(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Blocks.holyGrass.get().blockID;
-        this.fillerBlock = (byte)Blocks.holyDirt.get().blockID;
-        this.customBiomeDecorator.treesPerChunk = 20;
-        this.customBiomeDecorator.grassPerChunk = -999;
-		this.customBiomeDecorator.holyTallGrassPerChunk = 50;
-		this.customBiomeDecorator.promisedWillowPerChunk = 80;
-		this.customBiomeDecorator.pinkFlowersPerChunk = 12;
-		this.customBiomeDecorator.blueMilksPerChunk = 5;
-		this.customBiomeDecorator.generateLakes = false;
-		this.customBiomeDecorator.pondsPerChunk = -100;
-		this.customBiomeDecorator.hotSpringsPerChunk = 10;
-		this.customBiomeDecorator.crystalsPerChunk = 25;
-		this.customBiomeDecorator.crystals2PerChunk = 50;
-		this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-		this.spawnableMonsterList.clear();
-		this.spawnableCaveCreatureList.clear();
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Blocks.holyGrass.get().blockID;
+		fillerBlock = (byte)Blocks.holyDirt.get().blockID;
+		customBiomeDecorator.treesPerChunk = 20;
+		customBiomeDecorator.grassPerChunk = -999;
+		customBiomeDecorator.holyTallGrassPerChunk = 50;
+		customBiomeDecorator.promisedWillowPerChunk = 80;
+		customBiomeDecorator.pinkFlowersPerChunk = 12;
+		customBiomeDecorator.blueMilksPerChunk = 5;
+		customBiomeDecorator.generateLakes = false;
+		customBiomeDecorator.pondsPerChunk = -100;
+		customBiomeDecorator.hotSpringsPerChunk = 10;
+		customBiomeDecorator.crystalsPerChunk = 25;
+		customBiomeDecorator.crystals2PerChunk = 50;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableMonsterList.clear();
+		spawnableCaveCreatureList.clear();
+		customBiomeDecorator.generatePumpkins = false;
 		//this.customBiomeDecorator.generateClouds = true;
 		//this.customBiomeDecorator.generateLakes = false;
-		this.theWorldGenerator = new WorldGenWaterSpring(Liquids.springWater.get().blockID, 8);
+		theWorldGenerator = new WorldGenWaterSpring(Liquids.springWater.get().blockID, 8);
 		/*this.spawnableMonsterList.add(new SpawnListEntry(EntityCow.class, 6, 1, 4));
 
 		if (Loader.isModLoaded("TwilightForest"))
@@ -64,19 +64,22 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(4) == 0 ? new WorldGenPromisedTree3(false) : (par1Random.nextInt(2) == 0 ? new WorldGenPromisedShrub(0,0) : (par1Random.nextInt(8) == 0 ? new WorldGenPromisedTree2(false) : new WorldGenPromisedTree(false))));
+		return par1Random.nextInt(4) == 0 ? new WorldGenPromisedTree3(false) : (par1Random.nextInt(2) == 0 ? new WorldGenPromisedShrub(0,0) : (par1Random.nextInt(8) == 0 ? new WorldGenPromisedTree2(false) : new WorldGenPromisedTree(false)));
 	}
 
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 7925125;
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -90,19 +93,18 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
 			var6 = par3 + par2Random.nextInt(16);
 			var7 = par2Random.nextInt(60);
 			var8 = par4 + par2Random.nextInt(16);
-            this.theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
+			theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
 		}
 	}
 
 	/**
 	 * takes temperature, returns color
 	 */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return BOPConfiguration.promisedLandSkyColor;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java

@@ -20,27 +20,27 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
 	public BiomeGenPromisedLandPlains(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Blocks.holyGrass.get().blockID;
-        this.fillerBlock = (byte)Blocks.holyDirt.get().blockID;
-        this.customBiomeDecorator.treesPerChunk = 4;
-        this.customBiomeDecorator.grassPerChunk = -999;
-		this.customBiomeDecorator.holyTallGrassPerChunk = 999;
-		this.customBiomeDecorator.promisedWillowPerChunk = 80;
-		this.customBiomeDecorator.generateLakes = false;
-		this.customBiomeDecorator.pondsPerChunk = -100;
-		this.customBiomeDecorator.hotSpringsPerChunk = 6;
-		this.customBiomeDecorator.crystalsPerChunk = 25;
-		this.customBiomeDecorator.crystals2PerChunk = 50;
-		this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-		this.spawnableMonsterList.clear();
-		this.spawnableCaveCreatureList.clear();
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Blocks.holyGrass.get().blockID;
+		fillerBlock = (byte)Blocks.holyDirt.get().blockID;
+		customBiomeDecorator.treesPerChunk = 4;
+		customBiomeDecorator.grassPerChunk = -999;
+		customBiomeDecorator.holyTallGrassPerChunk = 999;
+		customBiomeDecorator.promisedWillowPerChunk = 80;
+		customBiomeDecorator.generateLakes = false;
+		customBiomeDecorator.pondsPerChunk = -100;
+		customBiomeDecorator.hotSpringsPerChunk = 6;
+		customBiomeDecorator.crystalsPerChunk = 25;
+		customBiomeDecorator.crystals2PerChunk = 50;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableMonsterList.clear();
+		spawnableCaveCreatureList.clear();
+		customBiomeDecorator.generatePumpkins = false;
 		//this.customBiomeDecorator.generateClouds = true;
 		//this.customBiomeDecorator.generateLakes = false;
-		this.theWorldGenerator = new WorldGenWaterSpring(Liquids.springWater.get().blockID, 8);
+		theWorldGenerator = new WorldGenWaterSpring(Liquids.springWater.get().blockID, 8);
 
 		/*if (Loader.isModLoaded("TwilightForest"))
 		{
@@ -58,6 +58,7 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		return new WorldGenPromisedBush();
@@ -66,11 +67,13 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 11266663;
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -84,19 +87,18 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
 			var6 = par3 + par2Random.nextInt(16);
 			var7 = par2Random.nextInt(60);
 			var8 = par4 + par2Random.nextInt(16);
-            this.theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
+			theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
 		}
 	}
 
 	/**
 	 * takes temperature, returns color
 	 */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return BOPConfiguration.promisedLandSkyColor;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java

@@ -21,31 +21,31 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
 	public BiomeGenPromisedLandSwamp(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)Blocks.holyGrass.get().blockID;
-        this.fillerBlock = (byte)Blocks.holyDirt.get().blockID;
-        this.customBiomeDecorator.treesPerChunk = 12;
-        this.customBiomeDecorator.grassPerChunk = -999;
-		this.customBiomeDecorator.holyTallGrassPerChunk = 100;
-		this.customBiomeDecorator.promisedWillowPerChunk = 80;
-		this.customBiomeDecorator.pinkFlowersPerChunk = 6;
-		this.customBiomeDecorator.blueMilksPerChunk = 15;
-		this.customBiomeDecorator.toadstoolsPerChunk = 10;
-		this.customBiomeDecorator.portobellosPerChunk = 5;
-		this.customBiomeDecorator.generateLakes = false;
-		this.customBiomeDecorator.pondsPerChunk = -100;
-		this.customBiomeDecorator.hotSpringsPerChunk = 20;
-		this.customBiomeDecorator.crystalsPerChunk = 25;
-		this.customBiomeDecorator.crystals2PerChunk = 50;
-		this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-		this.spawnableMonsterList.clear();
-		this.spawnableCaveCreatureList.clear();
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		topBlock = (byte)Blocks.holyGrass.get().blockID;
+		fillerBlock = (byte)Blocks.holyDirt.get().blockID;
+		customBiomeDecorator.treesPerChunk = 12;
+		customBiomeDecorator.grassPerChunk = -999;
+		customBiomeDecorator.holyTallGrassPerChunk = 100;
+		customBiomeDecorator.promisedWillowPerChunk = 80;
+		customBiomeDecorator.pinkFlowersPerChunk = 6;
+		customBiomeDecorator.blueMilksPerChunk = 15;
+		customBiomeDecorator.toadstoolsPerChunk = 10;
+		customBiomeDecorator.portobellosPerChunk = 5;
+		customBiomeDecorator.generateLakes = false;
+		customBiomeDecorator.pondsPerChunk = -100;
+		customBiomeDecorator.hotSpringsPerChunk = 20;
+		customBiomeDecorator.crystalsPerChunk = 25;
+		customBiomeDecorator.crystals2PerChunk = 50;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		spawnableMonsterList.clear();
+		spawnableCaveCreatureList.clear();
+		customBiomeDecorator.generatePumpkins = false;
 		//this.customBiomeDecorator.generateClouds = true;
 		//this.customBiomeDecorator.generateLakes = false;
-		this.theWorldGenerator = new WorldGenWaterSpring(Liquids.springWater.get().blockID, 8);
+		theWorldGenerator = new WorldGenWaterSpring(Liquids.springWater.get().blockID, 8);
 		/*this.spawnableMonsterList.add(new SpawnListEntry(EntityPig.class, 4, 1, 4));
 
 		if (Loader.isModLoaded("TwilightForest"))
@@ -63,19 +63,22 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(6) == 0 ? new WorldGenPromisedTree(false) : new WorldGenPromisedWillowTree());
+		return par1Random.nextInt(6) == 0 ? new WorldGenPromisedTree(false) : new WorldGenPromisedWillowTree();
 	}
 
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 4583331;
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -89,19 +92,18 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
 			var6 = par3 + par2Random.nextInt(16);
 			var7 = par2Random.nextInt(60);
 			var8 = par4 + par2Random.nextInt(16);
-            this.theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
+			theWorldGenerator.generate(par1World, par2Random, var6, var7, var8);
 		}
 	}
 
 	/**
 	 * takes temperature, returns color
 	 */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return BOPConfiguration.promisedLandSkyColor;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java

@@ -16,24 +16,25 @@ public class BiomeGenQuagmire extends BiomeGenBase
 	public BiomeGenQuagmire(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.topBlock = (byte)Blocks.mud.get().blockID;
-        this.fillerBlock = (byte)Blocks.mud.get().blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 0;
-        this.customBiomeDecorator.grassPerChunk = 10;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-        this.waterColorMultiplier = 13390080;
-		this.customBiomeDecorator.generateQuagmire = true;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		topBlock = (byte)Blocks.mud.get().blockID;
+		fillerBlock = (byte)Blocks.mud.get().blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 0;
+		customBiomeDecorator.grassPerChunk = 10;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		waterColorMultiplier = 13390080;
+		customBiomeDecorator.generateQuagmire = true;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
 		 return new WorldGenDeadTree(false);
@@ -42,6 +43,7 @@ public class BiomeGenQuagmire extends BiomeGenBase
 	 /**
 	  * Provides the basic grass color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 10390377;
@@ -50,6 +52,7 @@ public class BiomeGenQuagmire extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 10390377;
@@ -58,12 +61,11 @@ public class BiomeGenQuagmire extends BiomeGenBase
 	 /**
 	  * takes temperature, returns color
 	  */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 12436670;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenRainforest.java

@@ -19,31 +19,33 @@ public class BiomeGenRainforest extends BiomeGenBase
 	public BiomeGenRainforest(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 14;
-        this.customBiomeDecorator.grassPerChunk = 25;
-		this.customBiomeDecorator.pinkFlowersPerChunk = 2;
-        this.customBiomeDecorator.flowersPerChunk = 25;
-		this.customBiomeDecorator.rosesPerChunk = 10;
-		this.customBiomeDecorator.mushroomsPerChunk = 25;
-		this.customBiomeDecorator.orangeFlowersPerChunk = 6;
-		this.customBiomeDecorator.generatePumpkins = false;
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1));
-		this.spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 14;
+		customBiomeDecorator.grassPerChunk = 25;
+		customBiomeDecorator.pinkFlowersPerChunk = 2;
+		customBiomeDecorator.flowersPerChunk = 25;
+		customBiomeDecorator.rosesPerChunk = 10;
+		customBiomeDecorator.mushroomsPerChunk = 25;
+		customBiomeDecorator.orangeFlowersPerChunk = 6;
+		customBiomeDecorator.generatePumpkins = false;
+		spawnableMonsterList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1));
+		spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(15) == 0 ? this.worldGeneratorForest : (par1Random.nextInt(5) == 0 ? this.worldGeneratorBigTree : new WorldGenRainforestTree1(false)));
+		return par1Random.nextInt(15) == 0 ? worldGeneratorForest : (par1Random.nextInt(5) == 0 ? worldGeneratorBigTree : new WorldGenRainforestTree1(false));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
@@ -52,6 +54,7 @@ public class BiomeGenRainforest extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 1759340;
@@ -60,6 +63,7 @@ public class BiomeGenRainforest extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 1368687;

src/minecraft/biomesoplenty/biomes/BiomeGenRedwoodForest.java

@@ -17,26 +17,28 @@ public class BiomeGenRedwoodForest extends BiomeGenBase
 	public BiomeGenRedwoodForest(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 6;
-        this.customBiomeDecorator.grassPerChunk = 16;
-		this.customBiomeDecorator.bushesPerChunk = 4;
-		this.customBiomeDecorator.berryBushesPerChunk = 1;
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 6;
+		customBiomeDecorator.grassPerChunk = 16;
+		customBiomeDecorator.bushesPerChunk = 4;
+		customBiomeDecorator.berryBushesPerChunk = 1;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(4) == 0 ? new WorldGenRedwoodTree(false) : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenRedwoodTree2(false)));
+		return par1Random.nextInt(4) == 0 ? new WorldGenRedwoodTree(false) : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenRedwoodTree2(false));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);

src/minecraft/biomesoplenty/biomes/BiomeGenSacredSprings.java

@@ -20,25 +20,27 @@ public class BiomeGenSacredSprings extends BiomeGenBase
 	public BiomeGenSacredSprings(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 30;
-        this.customBiomeDecorator.grassPerChunk = 4;
-		this.customBiomeDecorator.waterlilyPerChunk = 5;
-		this.customBiomeDecorator.violetsPerChunk = 1;
-		this.customBiomeDecorator.hotSpringsPerChunk = 1;
-		this.customBiomeDecorator.generatePumpkins = false;
-		this.spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 30;
+		customBiomeDecorator.grassPerChunk = 4;
+		customBiomeDecorator.waterlilyPerChunk = 5;
+		customBiomeDecorator.violetsPerChunk = 1;
+		customBiomeDecorator.hotSpringsPerChunk = 1;
+		customBiomeDecorator.generatePumpkins = false;
+		spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		return new WorldGenShrub(0, 0);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -61,6 +63,7 @@ public class BiomeGenSacredSprings extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 39259;
@@ -69,6 +72,7 @@ public class BiomeGenSacredSprings extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 39259;
@@ -77,12 +81,11 @@ public class BiomeGenSacredSprings extends BiomeGenBase
 	 /**
 	  * takes temperature, returns color
 	  */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 1995007;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenSavanna.java

@@ -16,28 +16,30 @@ public class BiomeGenSavanna extends BiomeGenBase
 	public BiomeGenSavanna(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 2;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.purpleFlowersPerChunk = 10;
-        this.customBiomeDecorator.tinyFlowersPerChunk = 2;
-        this.customBiomeDecorator.grassPerChunk = 25;
-		this.customBiomeDecorator.bushesPerChunk = 10;
-		this.customBiomeDecorator.generatePumpkins = false;
-    }
-
-/**
-     * Gets a WorldGen appropriate for this biome.
-     */
-    public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
-    {
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenAcacia(false) : new WorldGenShrub(0,0));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 2;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.purpleFlowersPerChunk = 10;
+		customBiomeDecorator.tinyFlowersPerChunk = 2;
+		customBiomeDecorator.grassPerChunk = 25;
+		customBiomeDecorator.bushesPerChunk = 10;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
+	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
+	{
+		return par1Random.nextInt(3) == 0 ? new WorldGenAcacia(false) : new WorldGenShrub(0,0);
+	}
+
+	/**
+	 * Gets a WorldGen appropriate for this biome.
+	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);

src/minecraft/biomesoplenty/biomes/BiomeGenScrubland.java

@@ -16,26 +16,28 @@ public class BiomeGenScrubland extends BiomeGenBase
 	public BiomeGenScrubland(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 7;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.highGrassPerChunk = 2;
-        this.customBiomeDecorator.grassPerChunk = 30;
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 7;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.highGrassPerChunk = 2;
+		customBiomeDecorator.grassPerChunk = 30;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenShrub(0, 0) : new WorldGenScrubland(false));
+		return par1Random.nextInt(3) == 0 ? new WorldGenShrub(0, 0) : new WorldGenScrubland(false);
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(5) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);

src/minecraft/biomesoplenty/biomes/BiomeGenSeasonalForest.java

@@ -23,18 +23,19 @@ public class BiomeGenSeasonalForest extends BiomeGenBase
 	public BiomeGenSeasonalForest(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 20;
-        this.customBiomeDecorator.grassPerChunk = 8;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.toadstoolsPerChunk = 4;
+		spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 20;
+		customBiomeDecorator.grassPerChunk = 8;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.toadstoolsPerChunk = 4;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
@@ -43,14 +44,16 @@ public class BiomeGenSeasonalForest extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(2) == 0 ? new WorldGenAutumn2(false) : (par1Random.nextInt(3) == 0 ? new WorldGenAutumn(false) : (par1Random.nextInt(6) == 0 ? new WorldGenAutumn2Big(false) : (par1Random.nextInt(6) == 0 ? new WorldGenMapleBig(false) : (par1Random.nextInt(3) == 0 ? new WorldGenMaple(false) : (par1Random.nextInt(5) == 0 ? new WorldGenDeadTree2(false) : (par1Random.nextInt(6) == 0 ? this.worldGeneratorBigTree : this.worldGeneratorTrees)))))));
+		return par1Random.nextInt(2) == 0 ? new WorldGenAutumn2(false) : (par1Random.nextInt(3) == 0 ? new WorldGenAutumn(false) : (par1Random.nextInt(6) == 0 ? new WorldGenAutumn2Big(false) : (par1Random.nextInt(6) == 0 ? new WorldGenMapleBig(false) : (par1Random.nextInt(3) == 0 ? new WorldGenMaple(false) : (par1Random.nextInt(5) == 0 ? new WorldGenDeadTree2(false) : (par1Random.nextInt(6) == 0 ? worldGeneratorBigTree : worldGeneratorTrees))))));
 	}
 
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 11781186;
@@ -59,6 +62,7 @@ public class BiomeGenSeasonalForest extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 12502092;

src/minecraft/biomesoplenty/biomes/BiomeGenShield.java

@@ -16,25 +16,27 @@ public class BiomeGenShield extends BiomeGenBase
 	public BiomeGenShield(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 7;
-        this.customBiomeDecorator.grassPerChunk = 12;
-		this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-		this.customBiomeDecorator.gravelPerChunk = 4;
-        this.customBiomeDecorator.gravelPerChunk2 = 4;
-		this.customBiomeDecorator.generateStoneInGrass2 = true;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 7;
+		customBiomeDecorator.grassPerChunk = 12;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.gravelPerChunk = 4;
+		customBiomeDecorator.gravelPerChunk2 = 4;
+		customBiomeDecorator.generateStoneInGrass2 = true;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenTaiga5(false));
+		return par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenTaiga5(false);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -52,6 +54,7 @@ public class BiomeGenShield extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 6586168;
@@ -60,6 +63,7 @@ public class BiomeGenShield extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 7902787;

src/minecraft/biomesoplenty/biomes/BiomeGenShore.java

@@ -7,6 +7,6 @@ public class BiomeGenShore extends BiomeGenBase
 	public BiomeGenShore(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
+		spawnableCreatureList.clear();
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenShrubland.java

@@ -15,18 +15,19 @@ public class BiomeGenShrubland extends BiomeGenBase
 	public BiomeGenShrubland(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 0;
-        this.customBiomeDecorator.flowersPerChunk = 0;
-        this.customBiomeDecorator.grassPerChunk = 5;
-		this.customBiomeDecorator.bushesPerChunk = 7;
-		this.customBiomeDecorator.generatePumpkins = false;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 0;
+		customBiomeDecorator.flowersPerChunk = 0;
+		customBiomeDecorator.grassPerChunk = 5;
+		customBiomeDecorator.bushesPerChunk = 7;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		return new WorldGenShrub(0, 0);
@@ -35,6 +36,7 @@ public class BiomeGenShrubland extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);

src/minecraft/biomesoplenty/biomes/BiomeGenSludgepit.java

@@ -22,35 +22,37 @@ public class BiomeGenSludgepit extends BiomeGenBase
 	public BiomeGenSludgepit(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 30;
-        this.customBiomeDecorator.grassPerChunk = 30;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk = -999;
-        this.customBiomeDecorator.sandPerChunk2 = -999;
-        this.customBiomeDecorator.mudPerChunk = 5;
-        this.customBiomeDecorator.mudPerChunk2 = 5;
-        this.customBiomeDecorator.deadBushPerChunk = 5;
-		this.customBiomeDecorator.algaePerChunk = 2;
-		this.customBiomeDecorator.poisonWaterPerChunk = 5;
-		this.spawnableCreatureList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1));
-        this.waterColorMultiplier = 11506176;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 30;
+		customBiomeDecorator.grassPerChunk = 30;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.sandPerChunk = -999;
+		customBiomeDecorator.sandPerChunk2 = -999;
+		customBiomeDecorator.mudPerChunk = 5;
+		customBiomeDecorator.mudPerChunk2 = 5;
+		customBiomeDecorator.deadBushPerChunk = 5;
+		customBiomeDecorator.algaePerChunk = 2;
+		customBiomeDecorator.poisonWaterPerChunk = 5;
+		spawnableCreatureList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1));
+		waterColorMultiplier = 11506176;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenBog2() : new WorldGenBog1());
+		return par1Random.nextInt(3) == 0 ? new WorldGenBog2() : new WorldGenBog1();
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
@@ -59,6 +61,7 @@ public class BiomeGenSludgepit extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 7627817;
@@ -67,6 +70,7 @@ public class BiomeGenSludgepit extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 9539892;
@@ -75,12 +79,11 @@ public class BiomeGenSludgepit extends BiomeGenBase
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 7039816;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenSpruceWoods.java

@@ -17,21 +17,22 @@ public class BiomeGenSpruceWoods extends BiomeGenBase
 	public BiomeGenSpruceWoods(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4));
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 10;
-        this.customBiomeDecorator.grassPerChunk = 6;
-		this.customBiomeDecorator.sproutsPerChunk = 3;
-		this.customBiomeDecorator.poisonIvyPerChunk = 1;
-		this.customBiomeDecorator.berryBushesPerChunk = 3;
+		spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 10;
+		customBiomeDecorator.grassPerChunk = 6;
+		customBiomeDecorator.sproutsPerChunk = 3;
+		customBiomeDecorator.poisonIvyPerChunk = 1;
+		customBiomeDecorator.berryBushesPerChunk = 3;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenTaiga5(false) : new WorldGenTaiga2(false));
+		return par1Random.nextInt(3) == 0 ? new WorldGenTaiga5(false) : new WorldGenTaiga2(false);
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenSteppe.java

@@ -14,23 +14,24 @@ public class BiomeGenSteppe extends BiomeGenBase
 	public BiomeGenSteppe(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = -999;
-		this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = 15;
-        this.customBiomeDecorator.deadBushPerChunk = 7;
-		this.customBiomeDecorator.tinyCactiPerChunk = 1;
-		this.customBiomeDecorator.generateQuicksand = true;
-		this.customBiomeDecorator.steppePerChunk = 6;
-		this.customBiomeDecorator.aloePerChunk = 2;
-		this.customBiomeDecorator.generatePumpkins = false;
+		spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = -999;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = 15;
+		customBiomeDecorator.deadBushPerChunk = 7;
+		customBiomeDecorator.tinyCactiPerChunk = 1;
+		customBiomeDecorator.generateQuicksand = true;
+		customBiomeDecorator.steppePerChunk = 6;
+		customBiomeDecorator.aloePerChunk = 2;
+		customBiomeDecorator.generatePumpkins = false;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
@@ -39,11 +40,13 @@ public class BiomeGenSteppe extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 13413215;
 	}
 
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 13413215;

src/minecraft/biomesoplenty/biomes/BiomeGenSwampNew.java

@@ -21,30 +21,32 @@ public class BiomeGenSwampNew extends BiomeGenBase
 	public BiomeGenSwampNew(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 4;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.deadBushPerChunk = 1;
-        this.customBiomeDecorator.mushroomsPerChunk = 8;
-        this.customBiomeDecorator.reedsPerChunk = 10;
-        this.customBiomeDecorator.clayPerChunk = 1;
-        this.customBiomeDecorator.waterlilyPerChunk = 4;
-		this.customBiomeDecorator.mudPerChunk = 9;
-        this.customBiomeDecorator.mudPerChunk2 = 9;
-		this.customBiomeDecorator.portobellosPerChunk = 1;
-        this.waterColorMultiplier = 14745456;
-        this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 4;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.deadBushPerChunk = 1;
+		customBiomeDecorator.mushroomsPerChunk = 8;
+		customBiomeDecorator.reedsPerChunk = 10;
+		customBiomeDecorator.clayPerChunk = 1;
+		customBiomeDecorator.waterlilyPerChunk = 4;
+		customBiomeDecorator.mudPerChunk = 9;
+		customBiomeDecorator.mudPerChunk2 = 9;
+		customBiomeDecorator.portobellosPerChunk = 1;
+		waterColorMultiplier = 14745456;
+		spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenLog() : new WorldGenWillow());
+		return par1Random.nextInt(3) == 0 ? new WorldGenLog() : new WorldGenWillow();
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -62,20 +64,22 @@ public class BiomeGenSwampNew extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
-        double var1 = (double)this.getFloatTemperature();
-        double var3 = (double)this.getFloatRainfall();
+		double var1 = this.getFloatTemperature();
+		double var3 = this.getFloatRainfall();
 		return ((ColorizerGrass.getGrassColor(var1, var3) & 16711422) + 5115470) / 2;
 	}
 
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
-        double var1 = (double)this.getFloatTemperature();
-        double var3 = (double)this.getFloatRainfall();
+		double var1 = this.getFloatTemperature();
+		double var3 = this.getFloatRainfall();
 		return ((ColorizerFoliage.getFoliageColor(var1, var3) & 16711422) + 5115470) / 2;
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenTaigaNew.java

@@ -19,26 +19,28 @@ public class BiomeGenTaigaNew extends BiomeGenBase
 	public BiomeGenTaigaNew(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4));
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 10;
-        this.customBiomeDecorator.grassPerChunk = 1;
-		this.customBiomeDecorator.violetsPerChunk = 1;
+		spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 10;
+		customBiomeDecorator.grassPerChunk = 1;
+		customBiomeDecorator.violetsPerChunk = 1;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenTaiga1() : new WorldGenTaiga2(false));
+		return par1Random.nextInt(3) == 0 ? new WorldGenTaiga1() : new WorldGenTaiga2(false);
 		//return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenNorwaySpruce1() : new WorldGenNorwaySpruce2());
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);

src/minecraft/biomesoplenty/biomes/BiomeGenTemperateRainforest.java

@@ -21,32 +21,35 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase
 	public BiomeGenTemperateRainforest(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 22;
-        this.customBiomeDecorator.grassPerChunk = 25;
-		this.customBiomeDecorator.generatePumpkins = false;
-		this.customBiomeDecorator.blueMilksPerChunk = 3;
-		this.customBiomeDecorator.poisonIvyPerChunk = 1;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 22;
+		customBiomeDecorator.grassPerChunk = 25;
+		customBiomeDecorator.generatePumpkins = false;
+		customBiomeDecorator.blueMilksPerChunk = 3;
+		customBiomeDecorator.poisonIvyPerChunk = 1;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
 		//return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenGrandFir1() : (par1Random.nextInt(4) == 0 ? new WorldGenAlaskanCedar2() : (par1Random.nextInt(8) == 0 ? new WorldGenAlaskanCedar1() : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenGrandFir2()))));
-		return (WorldGenerator)(par1Random.nextInt(10) == 0 ? new WorldGenWillow() : (par1Random.nextInt(6) == 0 ? new WorldGenThickTree(false) : (par1Random.nextInt(2) == 0 ? new WorldGenTemperate(false) : new WorldGenShrub(0, 0))));
+		return par1Random.nextInt(10) == 0 ? new WorldGenWillow() : (par1Random.nextInt(6) == 0 ? new WorldGenThickTree(false) : (par1Random.nextInt(2) == 0 ? new WorldGenTemperate(false) : new WorldGenShrub(0, 0)));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return (par1Random.nextInt(6) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1))));
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -64,6 +67,7 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 11981671;
@@ -72,6 +76,7 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 12311907;

src/minecraft/biomesoplenty/biomes/BiomeGenThicket.java

@@ -15,13 +15,14 @@ public class BiomeGenThicket extends BiomeGenBase
 	public BiomeGenThicket(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 17;
-        this.customBiomeDecorator.grassPerChunk = 1;
-        this.customBiomeDecorator.thornsPerChunk = 25;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 17;
+		customBiomeDecorator.grassPerChunk = 1;
+		customBiomeDecorator.thornsPerChunk = 25;
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -44,8 +45,9 @@ public class BiomeGenThicket extends BiomeGenBase
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(5) == 0 ? this.worldGeneratorTrees : new WorldGenShrub(0, 0));
+		 return par1Random.nextInt(5) == 0 ? worldGeneratorTrees : new WorldGenShrub(0, 0);
 	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenTimber.java

@@ -17,26 +17,28 @@ public class BiomeGenTimber extends BiomeGenBase
 	public BiomeGenTimber(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 20;
-        this.customBiomeDecorator.grassPerChunk = 8;
-		this.customBiomeDecorator.thornsPerChunk = 2;
-		this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.toadstoolsPerChunk = 2;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 20;
+		customBiomeDecorator.grassPerChunk = 8;
+		customBiomeDecorator.thornsPerChunk = 2;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.toadstoolsPerChunk = 2;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(4) == 0 ? new WorldGenChaparral3() : (par1Random.nextInt(8) == 0 ? new WorldGenChaparral2() : new WorldGenDeciduous2(false)));
+		return par1Random.nextInt(4) == 0 ? new WorldGenChaparral3() : (par1Random.nextInt(8) == 0 ? new WorldGenChaparral2() : new WorldGenDeciduous2(false));
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(5) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
@@ -45,6 +47,7 @@ public class BiomeGenTimber extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 10923366;
@@ -53,6 +56,7 @@ public class BiomeGenTimber extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 11049817;

src/minecraft/biomesoplenty/biomes/BiomeGenTropicalRainforest.java

@@ -22,33 +22,35 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
 	public BiomeGenTropicalRainforest(int par1)
 	{
 		super(par1);
-        this.spawnableMonsterList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1));
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 12;
-        this.customBiomeDecorator.grassPerChunk = 7;
-		this.customBiomeDecorator.highGrassPerChunk = 4;
-        this.customBiomeDecorator.reedsPerChunk = 10;
-        this.customBiomeDecorator.waterlilyPerChunk = 2;
-        this.customBiomeDecorator.orangeFlowersPerChunk = 10;
-		this.customBiomeDecorator.generatePumpkins = false;
-		this.customBiomeDecorator.generateMelons = true;
-		this.customBiomeDecorator.sproutsPerChunk = 2;
-		this.customBiomeDecorator.generateQuicksand = true;
-		this.customBiomeDecorator.poisonIvyPerChunk = 4;
-		this.customBiomeDecorator.lilyflowersPerChunk = 2;
-		this.spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
-        this.waterColorMultiplier = 6160128;
+		spawnableMonsterList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1));
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 12;
+		customBiomeDecorator.grassPerChunk = 7;
+		customBiomeDecorator.highGrassPerChunk = 4;
+		customBiomeDecorator.reedsPerChunk = 10;
+		customBiomeDecorator.waterlilyPerChunk = 2;
+		customBiomeDecorator.orangeFlowersPerChunk = 10;
+		customBiomeDecorator.generatePumpkins = false;
+		customBiomeDecorator.generateMelons = true;
+		customBiomeDecorator.sproutsPerChunk = 2;
+		customBiomeDecorator.generateQuicksand = true;
+		customBiomeDecorator.poisonIvyPerChunk = 4;
+		customBiomeDecorator.lilyflowersPerChunk = 2;
+		spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
+		waterColorMultiplier = 6160128;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(5) == 0 ? new WorldGenRainforest2() : new WorldGenRainforest1(false));
+		return par1Random.nextInt(5) == 0 ? new WorldGenRainforest2() : new WorldGenRainforest1(false);
 	}
 
+	@Override
 	public void decorate(World par1World, Random par2Random, int par3, int par4)
 	{
 		super.decorate(par1World, par2Random, par3, par4);
@@ -71,6 +73,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 11002176;
@@ -79,6 +82,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 8970560;
@@ -87,12 +91,11 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
 	 /**
 	  * takes temperature, returns color
 	  */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 12971089;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenTropics.java

@@ -19,38 +19,38 @@ public class BiomeGenTropics extends BiomeGenBase
 	public BiomeGenTropics(int par1)
 	{
 		super(par1);
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 8;
-        this.customBiomeDecorator.grassPerChunk = 7;
-        this.customBiomeDecorator.flowersPerChunk = 10;
-        this.customBiomeDecorator.sandPerChunk = 50;
-        this.customBiomeDecorator.sandPerChunk2 = 50;
-        this.customBiomeDecorator.orangeFlowersPerChunk = 10;
-		this.customBiomeDecorator.whiteFlowersPerChunk = 4;
-		this.customBiomeDecorator.sunflowersPerChunk = 2;
-		this.customBiomeDecorator.generatePumpkins = false;
-		this.spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
-        this.spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 8;
+		customBiomeDecorator.grassPerChunk = 7;
+		customBiomeDecorator.flowersPerChunk = 10;
+		customBiomeDecorator.sandPerChunk = 50;
+		customBiomeDecorator.sandPerChunk2 = 50;
+		customBiomeDecorator.orangeFlowersPerChunk = 10;
+		customBiomeDecorator.whiteFlowersPerChunk = 4;
+		customBiomeDecorator.sunflowersPerChunk = 2;
+		customBiomeDecorator.generatePumpkins = false;
+		spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
+		spawnableCreatureList.clear();
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenPalmTree1() : new WorldGenPalmTree3());
+		return par1Random.nextInt(3) == 0 ? new WorldGenPalmTree1() : new WorldGenPalmTree3();
 	}
 
 	/**
 	 * takes temperature, returns color
 	 */
+	@Override
 	public int getSkyColorByTemp(float par1)
 	{
 		if (BOPConfiguration.skyColors = true)
-		{
 			return 3333631;
-		}	
 		else
 		{
 			par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenTundra.java

@@ -16,28 +16,30 @@ public class BiomeGenTundra extends BiomeGenBase
 	public BiomeGenTundra(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 5;
-        this.customBiomeDecorator.grassPerChunk = 8;
-		this.customBiomeDecorator.flowersPerChunk = -999;
-		this.customBiomeDecorator.reedsPerChunk = -999;
-		this.customBiomeDecorator.gravelPerChunk = 8;
-        this.customBiomeDecorator.gravelPerChunk2 = 8;
+		spawnableCreatureList.clear();
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 5;
+		customBiomeDecorator.grassPerChunk = 8;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.reedsPerChunk = -999;
+		customBiomeDecorator.gravelPerChunk = 8;
+		customBiomeDecorator.gravelPerChunk2 = 8;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-        return (WorldGenerator)(par1Random.nextInt(4) == 0 ? new WorldGenShrub(0,0) : new WorldGenTundra1());
+		return par1Random.nextInt(4) == 0 ? new WorldGenShrub(0,0) : new WorldGenTundra1();
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	@Override
 	public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
 	{
 		return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
@@ -46,6 +48,7 @@ public class BiomeGenTundra extends BiomeGenBase
 	/**
 	 * Provides the basic grass color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeGrassColor()
 	{
 		return 11371606;
@@ -54,6 +57,7 @@ public class BiomeGenTundra extends BiomeGenBase
 	/**
 	 * Provides the basic foliage color based on the biome temperature and rainfall
 	 */
+	@Override
 	public int getBiomeFoliageColor()
 	{
 		return 12543566;

src/minecraft/biomesoplenty/biomes/BiomeGenVolcano.java

@@ -16,21 +16,22 @@ public class BiomeGenVolcano extends BiomeGenBase
 	public BiomeGenVolcano(int par1)
 	{
 		super(par1);
-        this.spawnableCreatureList.clear();
-        this.topBlock = (byte)Blocks.ashStone.get().blockID;
-        this.fillerBlock = (byte)Blocks.ashStone.get().blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-        this.customBiomeDecorator.treesPerChunk = 1;
-        this.customBiomeDecorator.flowersPerChunk = -999;
-        this.customBiomeDecorator.grassPerChunk = -999;
-		this.customBiomeDecorator.lavaLakesPerChunk = 50;
-        this.customBiomeDecorator.generateAsh = true;
+		spawnableCreatureList.clear();
+		topBlock = (byte)Blocks.ashStone.get().blockID;
+		fillerBlock = (byte)Blocks.ashStone.get().blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 1;
+		customBiomeDecorator.flowersPerChunk = -999;
+		customBiomeDecorator.grassPerChunk = -999;
+		customBiomeDecorator.lavaLakesPerChunk = 50;
+		customBiomeDecorator.generateAsh = true;
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
 		 return new WorldGenVolcano();
@@ -39,12 +40,11 @@ public class BiomeGenVolcano extends BiomeGenBase
 	 /**
 	  * takes temperature, returns color
 	  */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 8026746;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;

src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java

@@ -16,21 +16,22 @@ public class BiomeGenWasteland extends BiomeGenBase
 	public BiomeGenWasteland(int par1)
 	{
 		super(par1);
-        this.topBlock = (byte)Blocks.driedDirt.get().blockID;
-        this.fillerBlock = (byte)Blocks.driedDirt.get().blockID;
-        this.theBiomeDecorator = new BiomeDecoratorBOP(this);
-        this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.customBiomeDecorator.treesPerChunk = 0;
-        this.customBiomeDecorator.deadGrassPerChunk = 14;
-		this.customBiomeDecorator.poisonWaterPerChunk = 10;
-        this.waterColorMultiplier = 15073024;
-        this.spawnableCreatureList.clear();
-        this.spawnableWaterCreatureList.clear();
+		topBlock = (byte)Blocks.driedDirt.get().blockID;
+		fillerBlock = (byte)Blocks.driedDirt.get().blockID;
+		theBiomeDecorator = new BiomeDecoratorBOP(this);
+		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
+		customBiomeDecorator.treesPerChunk = 0;
+		customBiomeDecorator.deadGrassPerChunk = 14;
+		customBiomeDecorator.poisonWaterPerChunk = 10;
+		waterColorMultiplier = 15073024;
+		spawnableCreatureList.clear();
+		spawnableWaterCreatureList.clear();
 	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.
 	 */
+	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
 		 return new WorldGenDeadTree3(false);
@@ -39,6 +40,7 @@ public class BiomeGenWasteland extends BiomeGenBase
 	 /**
 	  * Provides the basic grass color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeGrassColor()
 	 {
 		 return 10330232;
@@ -47,6 +49,7 @@ public class BiomeGenWasteland extends BiomeGenBase
 	 /**
 	  * Provides the basic foliage color based on the biome temperature and rainfall
 	  */
+	 @Override
 	 public int getBiomeFoliageColor()
 	 {
 		 return 10067541;
@@ -55,12 +58,11 @@ public class BiomeGenWasteland extends BiomeGenBase
 	 /**
 	  * takes temperature, returns color
 	  */
+	 @Override
 	 public int getSkyColorByTemp(float par1)
 	 {
 		 if (BOPConfiguration.skyColors = true)
-		{
 			 return 10465942;
-		}	
 		 else
 		 {
 			 par1 /= 3.0F;