Cleanup

Author: Clashsoft

src/main/java/clashsoft/cslib/minecraft/block/BlockCustomFarmland.java

@@ -13,8 +13,8 @@
 
 public class BlockCustomFarmland extends BlockFarmland
 {
-	public Block dirtBlock;
-	public int dirtMetadata;
+	public Block	dirtBlock;
+	public int		dirtMetadata;
 
 	public BlockCustomFarmland(Block dirtBlock)
 	{
@@ -29,51 +29,51 @@ public BlockCustomFarmland(Block dirtBlock, int dirtMetadata)
 
 	@Override
 	public void onFallenUpon(World world, int x, int y, int z, Entity entity, float f)
-    {
-        if (!world.isRemote && world.rand.nextFloat() < f - 0.5F)
-        {
-            if (!(entity instanceof EntityPlayer) && !world.getGameRules().getGameRuleBooleanValue("mobGriefing"))
-            {
-                return;
-            }
-
-            world.setBlock(x, y, z, this.dirtBlock, this.dirtMetadata, 3);
-        }
-    }
+	{
+		if (!world.isRemote && world.rand.nextFloat() < f - 0.5F)
+		{
+			if (!(entity instanceof EntityPlayer) && !world.getGameRules().getGameRuleBooleanValue("mobGriefing"))
+			{
+				return;
+			}
+			
+			world.setBlock(x, y, z, this.dirtBlock, this.dirtMetadata, 3);
+		}
+	}
 
 	@Override
 	public void onNeighborBlockChange(World world, int x, int y, int z, Block block)
-    {
-        super.onNeighborBlockChange(world, x, y, z, block);
-        Material material = world.getBlock(x, y + 1, z).getMaterial();
-
-        if (material.isSolid())
-        {
-        	world.setBlock(x, y, z, this.dirtBlock, this.dirtMetadata, 3);
-        }
-    }
+	{
+		super.onNeighborBlockChange(world, x, y, z, block);
+		Material material = world.getBlock(x, y + 1, z).getMaterial();
+		
+		if (material.isSolid())
+		{
+			world.setBlock(x, y, z, this.dirtBlock, this.dirtMetadata, 3);
+		}
+	}
 
 	@Override
 	public IIcon getIcon(int side, int metadata)
 	{
 		return side == 1 ? super.getIcon(1, metadata) : this.dirtBlock.getIcon(side, this.dirtMetadata);
 	}
-
-    @Override
+	
+	@Override
 	public Item getItemDropped(int metadata, Random random, int fortune)
-    {
-        return this.dirtBlock.getItemDropped(this.dirtMetadata, random, fortune);
-    }
-    
-    @Override
-    public int damageDropped(int metadata)
-    {
-    	return this.dirtBlock.damageDropped(this.dirtMetadata);
-    }
-
-    @Override
+	{
+		return this.dirtBlock.getItemDropped(this.dirtMetadata, random, fortune);
+	}
+	
+	@Override
+	public int damageDropped(int metadata)
+	{
+		return this.dirtBlock.damageDropped(this.dirtMetadata);
+	}
+	
+	@Override
 	public Item getItem(World world, int x, int y, int z)
-    {
-        return Item.getItemFromBlock(this.dirtBlock);
-    }
+	{
+		return Item.getItemFromBlock(this.dirtBlock);
+	}
 }

src/main/java/clashsoft/cslib/minecraft/block/BlockCustomGlass.java

@@ -46,21 +46,21 @@ public boolean isOpaqueCube()
 
 	@Override
 	public boolean renderAsNormalBlock()
-    {
-        return false;
-    }
-
+	{
+		return false;
+	}
+	
 	@Override
 	public int getRenderBlockPass()
 	{
 		return this.isTransparent ? 1 : 0;
 	}
 
-    @Override
+	@Override
 	protected boolean canSilkHarvest()
-    {
-        return true;
-    }
+	{
+		return true;
+	}
 
 	@Override
 	@SideOnly(Side.CLIENT)

src/main/java/clashsoft/cslib/minecraft/block/ICustomBlock.java

@@ -7,7 +7,7 @@
 
 public interface ICustomBlock
 {
-	public static final String[] DEFAULT_NAMES = new String[] { null };
+	public static final String[]	DEFAULT_NAMES	= new String[] { null };
 
 	public String getUnlocalizedName(ItemStack stack);
 

src/main/java/clashsoft/cslib/minecraft/block/ore/BlockOre2.java

@@ -147,9 +147,8 @@ public void registerBlockIcons(IIconRegister iconRegister)
 		{
 			return;
 		}
-		for (int i = 0; i < this.bases.length; i++)
+		for (OreBase base : this.bases)
 		{
-			OreBase base = this.bases[i];
 			if (base != null)
 			{
 				base.registerIcons(iconRegister);

src/main/java/clashsoft/cslib/minecraft/block/ore/OreBaseStone.java

@@ -6,13 +6,13 @@
 
 public class OreBaseStone extends OreBase
 {
-	public IIcon coalIcon;
-	public IIcon ironIcon;
-	public IIcon goldIcon;
-	public IIcon diamondIcon;
-	public IIcon emeraldIcon;
-	public IIcon redstoneIcon;
-	public IIcon lapisIcon;
+	public IIcon	coalIcon;
+	public IIcon	ironIcon;
+	public IIcon	goldIcon;
+	public IIcon	diamondIcon;
+	public IIcon	emeraldIcon;
+	public IIcon	redstoneIcon;
+	public IIcon	lapisIcon;
 
 	OreBaseStone(String name, float multiplier)
 	{

src/main/java/clashsoft/cslib/minecraft/client/renderer/block/RenderBlockSimple.java

@@ -7,7 +7,7 @@
 
 public abstract class RenderBlockSimple implements ISimpleBlockRenderingHandler
 {
-	protected boolean rendering;
+	protected boolean	rendering;
 
 	@Override
 	public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer)

src/main/java/clashsoft/cslib/minecraft/entity/CSEntities.java

@@ -74,6 +74,7 @@ public static void register(String name, int id, Class<? extends Entity> clazz,
 	/**
 	 * @deprecated Use {@link #replace(Class, Class)} instead.
 	 */
+	@Deprecated
 	public static void replace(String name, int id, Class<? extends Entity> clazz)
 	{
 		register(name, id, clazz);
@@ -82,6 +83,7 @@ public static void replace(String name, int id, Class<? extends Entity> clazz)
 	/**
 	 * @deprecated Use {@link #replace(Class, Class)} instead.
 	 */
+	@Deprecated
 	public static void replace(String name, int id, Class<? extends Entity> clazz, int eggColor1, int eggColor2)
 	{
 		register(name, id, clazz, eggColor1, eggColor2);

src/main/java/clashsoft/cslib/minecraft/item/block/ItemCustomSlab.java

@@ -22,7 +22,7 @@ public ItemCustomSlab(Block block)
 
 		if (block instanceof BlockCustomSlab)
 		{
-			BlockCustomSlab slab = ((BlockCustomSlab) block);
+			BlockCustomSlab slab = (BlockCustomSlab) block;
 			BlockCustomSlab otherSlab = slab.otherSlab;
 
 			this.isDoubleSlab = block.isOpaqueCube();

src/main/java/clashsoft/cslib/minecraft/world/CustomBiomeLayer.java

@@ -30,7 +30,7 @@ public GenLayer[] generate(long seed, WorldType worldType)
 		biomes.initWorldGenSeed(seed);
 		voronoiZoom.initWorldGenSeed(seed);
 
-		return new GenLayer[] { biomes, voronoiZoom };	
+		return new GenLayer[] { biomes, voronoiZoom };
 	}
 
 	@Override

src/main/java/clashsoft/cslib/minecraft/world/biome/CustomBiome.java

@@ -18,7 +18,7 @@ public abstract class CustomBiome extends BiomeGenBase implements ICustomBiome
 	public Block	waterBlock	= Blocks.water;
 	public byte		waterMetadata;
 
-	public int	waterLevel;
+	public int		waterLevel;
 
 	public CustomBiome(int id)
 	{