Removed some commented out pre-0.5.2 code

src/minecraft/biomesoplenty/CommonProxy.java

@@ -4,7 +4,8 @@ package biomesoplenty;
 public class CommonProxy 
 {
 	// Client stuff
-	public void registerRenderers() {
+	public void registerRenderers() 
+	{
 		// Nothing here as the server doesn't render graphics!
 	}
 

src/minecraft/biomesoplenty/api/Blocks.java

@@ -85,13 +85,9 @@ 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> amethystOre                 = 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> promisedPortal              = Optional.absent();
 	public static Optional<? extends Block> glass                       = Optional.absent();

src/minecraft/biomesoplenty/blocks/BlockBamboo.java

@@ -76,19 +76,12 @@ public class BlockBamboo extends Block
 			return false;
 	}
 
-	/**
-	 * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
-	 * their own) Args: x, y, z, neighbor blockID
-	 */
 	@Override
 	public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, int par5)
 	{
 		this.checkBlockCoordValid(par1World, par2, par3, par4);
 	}
 
-	/**
-	 * Checks if current block pos is valid, if not, breaks the block as dropable item. Used for reed and cactus.
-	 */
 	protected final void checkBlockCoordValid(World par1World, int par2, int par3, int par4)
 	{
 		if (!this.canBlockStay(par1World, par2, par3, par4))
@@ -98,59 +91,30 @@ public class BlockBamboo extends Block
 		}
 	}
 
-	/**
-	 * Can this block stay at this position.  Similar to canPlaceBlockAt except gets checked often with plants.
-	 */
 	@Override
 	public boolean canBlockStay(World par1World, int par2, int par3, int par4)
 	{
 		return this.canPlaceBlockAt(par1World, par2, par3, par4);
 	}
 
-	/**
-	 * Returns the ID of the items to drop on destruction.
-	 */
-	//    public int idDropped(int par1, Random par2Random, int par3)
-	//    {
-	//        return BOPItems.bambooItem.itemID;
-	//    }
-
-	/**
-	 * Is this block (a) opaque and (b) a full 1m cube?  This determines whether or not to render the shared face of two
-	 * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
-	 */
 	@Override
 	public boolean isOpaqueCube()
 	{
 		return false;
 	}
 
-	/**
-	 * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
-	 */
 	@Override
 	public boolean renderAsNormalBlock()
 	{
 		return false;
 	}
 
-	/**
-	 * The type of render function that is called for this block
-	 */
 	@Override
 	public int getRenderType()
 	{
 		return 1;
 	}
 
-	/**
-	 * only called by clickMiddleMouseButton , and passed to inventory.setCurrentItem (along with isCreative)
-	 */
-	//    public int idPicked(World par1World, int par2, int par3, int par4)
-	//    {
-	//        return BOPItems.bambooItem.itemID;
-	//    }
-
 	@Override
 	public boolean canSustainLeaves(World world, int x, int y, int z)
 	{

src/minecraft/biomesoplenty/blocks/BlockMoss.java

@@ -455,31 +455,12 @@ public class BlockMoss extends Block
 		return b0 != 0 ? b0 : par9;
 	}
 
-	/**
-	 * Returns the ID of the items to drop on destruction.
-	 */
-	//    public int idDropped(int par1, Random par2Random, int par3)
-	//    {
-	//        return BOPItems.mossItem.itemID;
-	//    }
-
-	/**
-	 * Returns the quantity of items to drop on block destruction.
-	 */
 	@Override
 	public int quantityDropped(Random par1Random)
 	{
 		return 1;
 	}
 
-	/**
-	 * only called by clickMiddleMouseButton , and passed to inventory.setCurrentItem (along with isCreative)
-	 */
-	//    public int idPicked(World par1World, int par2, int par3, int par4)
-	//    {
-	//        return BOPItems.mossItem.itemID;
-	//    }
-
 	@Override
 	public boolean isBlockReplaceable(World world, int x, int y, int z)
 	{

src/minecraft/biomesoplenty/configuration/BOPBlocks.java

@@ -76,7 +76,8 @@ import com.google.common.base.Optional;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 
-public class BOPBlocks {
+public class BOPBlocks 
+{
 	public static void init()
 	{
 		initializeBlocks();
@@ -96,7 +97,6 @@ public class BOPBlocks {
 		MinecraftForge.setBlockHarvestLevel(Blocks.originGrass.get(), "shovel", 0);
 		MinecraftForge.setBlockHarvestLevel(Blocks.hardSand.get(), "shovel", 0);
 		MinecraftForge.setBlockHarvestLevel(Blocks.holyGrass.get(), 0, "pickaxe", 0);
-		//		MinecraftForge.setBlockHarvestLevel(Blocks.quicksand.get(), "shovel", 0);
 
 		MinecraftForge.setBlockHarvestLevel(Blocks.driedDirt.get(), "pickaxe", 0);
 		MinecraftForge.setBlockHarvestLevel(Blocks.altar.get(), "pickaxe", 0);
@@ -155,15 +155,13 @@ public class BOPBlocks {
 		Blocks.holyBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.holyBrickStairsID, Blocks.holyStone.get(), Category.HOLY_BRICKS)).setUnlocalizedName("bop.holyBricksStairs"));
 		Blocks.crystal = Optional.of(new BlockBOPGeneric(BOPConfiguration.crystalID, Material.glass, BlockType.CRYSTAL));
 		Blocks.promisedPortal = Optional.of(new BlockPromisedPortal(BOPConfiguration.promisedLandPortalID).setUnlocalizedName("bop.promisedPortal").setBlockUnbreakable().setResistance(6000000.0F).setLightValue(1.0F));
-		//        Blocks.amethystOre = Optional.of(new BlockBOPGeneric(BOPConfiguration.amethystOreID, Material.rock, BlockType.AMETHYST_ORE));
+
-		//        Blocks.amethystBlock = Optional.of(new BlockBOPGeneric(BOPConfiguration.amethystBlockID, Material.iron, BlockType.AMETHYST_BLOCK));
 		Blocks.amethystOre = Optional.of(new BlockBOPAmethyst(BOPConfiguration.amethystOreID, Material.rock).setUnlocalizedName("bop.amethystOre"));
-		//        Blocks.bambooThatching = Optional.of(new BlockBOPGeneric(BOPConfiguration.bambooThatchingID, Material.wood, BlockType.BAMBOO_THATCHING));
+
 		Blocks.moss = Optional.of((new BlockMoss(BOPConfiguration.mossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.moss"));
-		//        Blocks.smolderingGrass = Optional.of((BlockSmolderingGrass)(new BlockSmolderingGrass(BOPConfiguration.smolderingGrassID)).setHardness(0.6F).setLightValue(0.25F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.smolderingGrass"));
+		
 		Blocks.cragRock = Optional.of(new BlockBOPGeneric(BOPConfiguration.cragRockID, Material.rock, BlockType.CRAG_ROCK));
-		//        Blocks.quicksand = Optional.of((new BlockQuicksand(BOPConfiguration.quicksandID)).setHardness(0.3F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.quicksand"));
+		
-		//        Blocks.grass = Optional.of(new BlockBOPGrass(3000).setUnlocalizedName("bop.holyGrass"));
 		Blocks.cloud = Optional.of((new BlockCloud(BOPConfiguration.cloudID)).setHardness(0.1F).setLightOpacity(3).setStepSound(Block.soundClothFootstep).setUnlocalizedName("bop.cloud"));
 
 		Blocks.bones = Optional.of((new BlockBones(BOPConfiguration.bonesID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.bones"));
@@ -233,7 +231,6 @@ public class BOPBlocks {
 		GameRegistry.registerBlock(Blocks.hardSand.get(), "bop.hardSand");
 		GameRegistry.registerBlock(Blocks.hardDirt.get(), "bop.hardDirt");
 		GameRegistry.registerBlock(Blocks.crystal.get(), "bop.crystal");
-		//        GameRegistry.registerBlock(Blocks.holyGrass.get(), "bop.holyGrass");
 		GameRegistry.registerBlock(Blocks.holyGrass.get(), ItemBOPGrass.class, "bop.holyGrass");
 		GameRegistry.registerBlock(Blocks.holyDirt.get(), "bop.holyDirt");
 		GameRegistry.registerBlock(Blocks.holyStone.get(), ItemBOPSkystone.class, "bop.holyStone");
@@ -241,13 +238,8 @@ public class BOPBlocks {
 		GameRegistry.registerBlock(Blocks.holyBricksStairs.get(), "bop.holyBricksStairs");
 		GameRegistry.registerBlock(Blocks.promisedPortal.get(), "bop.promisedPortal");
 		GameRegistry.registerBlock(Blocks.amethystOre.get(), ItemBOPAmethyst.class, "bop.amethystOre");
-		//        GameRegistry.registerBlock(Blocks.amethystBlock.get(), "bop.amethystBlock");
-		//        GameRegistry.registerBlock(Blocks.bambooThatching.get(), "bop.bambooThatching");
 		GameRegistry.registerBlock(Blocks.moss.get(), ItemBOPMoss.class, "bop.moss");
-		//        GameRegistry.registerBlock(Blocks.smolderingGrass.get(), "bop.smolderingGrass");
 		GameRegistry.registerBlock(Blocks.cragRock.get(), "bop.cragRock");
-		//        GameRegistry.registerBlock(Blocks.quicksand.get(), "bop.quicksand");
-		//        GameRegistry.registerBlock(Blocks.amethyst.get(), ItemBOPAmethyst.class, "bop.amethystOre1");
 		GameRegistry.registerBlock(Blocks.cloud.get(), "bop.cloud");
 
 		GameRegistry.registerBlock(Blocks.bones.get(), ItemBOPBones.class, "bop.bones");

src/minecraft/biomesoplenty/configuration/BOPCrafting.java

@@ -280,7 +280,6 @@ public class BOPCrafting
 		OreDictionary.registerOre("gemPeridot", new ItemStack(Items.miscItems.get(), 1, 11));
 		OreDictionary.registerOre("gemTopaz", new ItemStack(Items.miscItems.get(), 1, 12));
 		OreDictionary.registerOre("gemTanzanite", new ItemStack(Items.miscItems.get(), 1, 13));
-		//OreDictionary.registerOre("gemApatite", new ItemStack(Items.miscItems.get(), 1, 14));
 		OreDictionary.registerOre("gemSapphire", new ItemStack(Items.miscItems.get(), 1, 15));
 
 		OreDictionary.registerOre("treeSapling", new ItemStack(Blocks.saplings.get(), 1, OreDictionary.WILDCARD_VALUE));
@@ -294,9 +293,6 @@ public class BOPCrafting
 		OreDictionary.registerOre("slabWood", new ItemStack(Blocks.woodenSingleSlab1.get(), 1, OreDictionary.WILDCARD_VALUE));
 		OreDictionary.registerOre("slabWood", new ItemStack(Blocks.woodenSingleSlab2.get(), 1, OreDictionary.WILDCARD_VALUE));
 
-		//        OreDictionary.registerOre("slabWood", new ItemStack(Blocks.woodenDoubleSlab1.get()));
-		//        OreDictionary.registerOre("slabWood", new ItemStack(Blocks.woodenDoubleSlab2.get()));
-
 		OreDictionary.registerOre("stairWood", new ItemStack(Blocks.redwoodStairs.get()));
 		OreDictionary.registerOre("stairWood", new ItemStack(Blocks.willowStairs.get()));
 		OreDictionary.registerOre("stairWood", new ItemStack(Blocks.acaciaStairs.get()));

src/minecraft/biomesoplenty/particles/EntityDandelionFX.java

@@ -37,7 +37,6 @@ public class EntityDandelionFX extends EntityFX
 
 		GL11.glDepthMask(false);
 		GL11.glEnable(3042);
-		//GL11.glBlendFunc(770, 1);
 
 		FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture);