Merge pull request #484 from alexbegt/master

Doing code cleanup.

src/main/java/tconstruct/blocks/BlockFalling.java

@@ -24,16 +24,19 @@ public class BlockFalling extends Block
         super(p_i45405_1_);
     }
 
+    @Override
     public void onBlockAdded (World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
     {
         p_149726_1_.scheduleBlockUpdate(p_149726_2_, p_149726_3_, p_149726_4_, this, this.tickRate(p_149726_1_));
     }
 
+    @Override
     public void onNeighborBlockChange (World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
     {
         p_149695_1_.scheduleBlockUpdate(p_149695_2_, p_149695_3_, p_149695_4_, this, this.tickRate(p_149695_1_));
     }
 
+    @Override
     public void updateTick (World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
     {
         if (!p_149674_1_.isRemote)
@@ -84,6 +87,7 @@ public class BlockFalling extends Block
     {
     }
 
+    @Override
     public int tickRate (World p_149738_1_)
     {
         return 2;

src/main/java/tconstruct/blocks/BlockLandmine.java

@@ -415,6 +415,7 @@ public class BlockLandmine extends BlockContainer
         }
     }
 
+    @Override
     public void onEntityCollidedWithBlock (World par1World, int par2, int par3, int par4, Entity par5Entity)
     {
         if (!par1World.isRemote)

src/main/java/tconstruct/blocks/BloodBlock.java

@@ -16,6 +16,7 @@ public class BloodBlock extends TConstructFluid
         super(fluid, material, texture);
     }
 
+    @Override
     public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
     {
         if (entity instanceof EntityLivingBase)

src/main/java/tconstruct/blocks/ConveyorBase.java

@@ -100,6 +100,7 @@ public class ConveyorBase extends MantleBlock
         world.setBlockMetadataWithNotify(x, y, z, face | meta, 2);
     }
 
+    @Override
     public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
     {
         if (side == 1)

src/main/java/tconstruct/blocks/CraftingSlab.java

@@ -63,6 +63,7 @@ public class CraftingSlab extends InventorySlab
         return 1;
     }
 
+    @Override
     public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z)
     {
         int metadata = world.getBlockMetadata(x, y, z);

src/main/java/tconstruct/blocks/CraftingStationBlock.java

@@ -26,10 +26,10 @@ public class CraftingStationBlock extends InventoryBlock
         super(material);
         this.setCreativeTab(TConstructRegistry.blockTab);
         this.setHardness(2f);
-        this.stepSound = Block.soundTypeWood;
+        this.setStepSound(Block.soundTypeWood);
     }
 
-    // Block.hasComparatorInputOverride and Block.getComparatorInputOverride
+    //Block.hasComparatorInputOverride and Block.getComparatorInputOverride
 
     /* Rendering */
     @Override
@@ -43,7 +43,7 @@ public class CraftingStationBlock extends InventoryBlock
     @Override
     public IIcon getIcon (int side, int meta)
     {
-        return icons[meta * 3 + getTextureIndex(side)];
+        return icons[getTextureIndex(side)];
     }
 
     public int getTextureIndex (int side)
@@ -106,4 +106,4 @@ public class CraftingStationBlock extends InventoryBlock
     {
         return new CraftingStationLogic();
     }
-}
+}

src/main/java/tconstruct/blocks/DryingRack.java

@@ -56,6 +56,7 @@ public class DryingRack extends InventoryBlock
         return TConstruct.instance;
     }
 
+    @Override
     public int onBlockPlaced (World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta)
     {
         if (side > 1)
@@ -117,6 +118,7 @@ public class DryingRack extends InventoryBlock
         AbilityHelper.spawnItemAtPlayer(player, stack);
     }
 
+    @Override
     public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z)
     {
         int metadata = world.getBlockMetadata(x, y, z);
@@ -158,6 +160,7 @@ public class DryingRack extends InventoryBlock
         return AxisAlignedBB.getAABBPool().getAABB((double) x + xMin, (double) y + yMin, (double) z + zMin, (double) x + xMax, (double) y + yMax, (double) z + zMax);
     }
 
+    @Override
     public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z)
     {
         int metadata = world.getBlockMetadata(x, y, z);
@@ -199,6 +202,7 @@ public class DryingRack extends InventoryBlock
         this.setBlockBounds(xMin, yMin, zMin, xMax, yMax, zMax);
     }
 
+    @Override
     public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity)
     {
         this.setBlockBoundsBasedOnState(world, x, y, z);

src/main/java/tconstruct/blocks/EquipBlock.java

@@ -42,11 +42,13 @@ public class EquipBlock extends InventoryBlock
         return new String[] { "toolstation_top" };
     }
 
+    @Override
     public IIcon getIcon (int side, int meta)
     {
         return Blocks.iron_block.getIcon(side, meta);
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons (IIconRegister par1IconRegister)
     {
@@ -84,6 +86,7 @@ public class EquipBlock extends InventoryBlock
         return new FrypanLogic();
     }
 
+    @Override
     public void randomDisplayTick (World world, int x, int y, int z, Random random)
     {
         if (isActive(world, x, y, z))
@@ -97,6 +100,7 @@ public class EquipBlock extends InventoryBlock
         }
     }
 
+    @Override
     public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack)
     {
         super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack);
@@ -171,6 +175,7 @@ public class EquipBlock extends InventoryBlock
         super.breakBlock(par1World, x, y, z, par5, meta);
     }
 
+    @Override
     public int getLightValue (IBlockAccess world, int x, int y, int z)
     {
         return !isActive(world, x, y, z) ? 0 : 9;

src/main/java/tconstruct/blocks/FurnaceSlab.java

@@ -62,6 +62,7 @@ public class FurnaceSlab extends InventorySlab
         return icons[(meta % 8) * 3 + getTextureIndex(side)];
     }
 
+    @Override
     public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side)
     {
         TileEntity logic = world.getTileEntity(x, y, z);

src/main/java/tconstruct/blocks/GlassBlock.java

@@ -19,11 +19,13 @@ public class GlassBlock extends TConstructBlock
         super(Material.glass, 3f, blockTextures);
     }
 
+    @Override
     public boolean isOpaqueCube ()
     {
         return false;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
     {
@@ -48,6 +50,7 @@ public class GlassBlock extends TConstructBlock
         }
     }
 
+    @Override
     public float getExplosionResistance (Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ)
     {
         int meta = world.getBlockMetadata(x, y, z);

src/main/java/tconstruct/blocks/GlassBlockStained.java

@@ -25,11 +25,13 @@ public class GlassBlockStained extends TConstructBlock
         return 1;
     }
 
+    @Override
     public boolean isOpaqueCube ()
     {
         return false;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
     {

src/main/java/tconstruct/blocks/GlassPaneConnected.java

@@ -671,6 +671,7 @@ public class GlassPaneConnected extends GlassBlockConnected
         return b.isOpaqueCube() || b == (Block) this || b == Blocks.glass;
     }
 
+    @Override
     public void registerBlockIcons (IIconRegister par1IconRegister)
     {
         super.registerBlockIcons(par1IconRegister);

src/main/java/tconstruct/blocks/GlueBlock.java

@@ -48,6 +48,7 @@ public class GlueBlock extends TConstructBlock
         }
     }
 
+    @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
     {
         return Blocks.soul_sand.getCollisionBoundingBoxFromPool(world, x, y, z);

src/main/java/tconstruct/blocks/GravelOre.java

@@ -3,26 +3,28 @@ package tconstruct.blocks;
 import java.util.List;
 import java.util.Random;
 
-import net.minecraft.block.Block;
+import net.minecraft.block.BlockSand;
+import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
+import tconstruct.common.TRepo;
 import tconstruct.library.TConstructRegistry;
 
-public class GravelOre extends BlockFalling
+public class GravelOre extends BlockSand
 {
     public String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt" };
     public IIcon[] icons;
 
     public GravelOre()
     {
-        super();
+        //super(Material.craftedSnow);
+        this.blockMaterial = Material.craftedSnow;
         this.setCreativeTab(TConstructRegistry.blockTab);
-        this.stepSound = soundTypeGravel;
-        // this.blockMaterial = Material.craftedSnow;
+        this.setStepSound(soundTypeGravel);
     }
 
     @Override
@@ -42,6 +44,7 @@ public class GravelOre extends BlockFalling
         return icons[meta];
     }
 
+    @Override
     public float getBlockHardness (World world, int x, int y, int z)
     {
         int meta = world.getBlockMetadata(x, y, z);
@@ -54,26 +57,25 @@ public class GravelOre extends BlockFalling
     @Override
     public int damageDropped (int meta)
     {
-        /*
-         * if (meta == 1) return 0;
-         */
+        /*if (meta == 1)
+            return 0;*/
         return meta;
     }
 
-    public Block idDropped (int par1, Random par2Random, int par3)
+    @Override
+    public Item getItemDropped (int p_149650_1_, Random p_149650_2_, int p_149650_3_)
     {
-        /*
-         * if (par1 == 1) return Item.goldNugget.itemID;
-         */
-        return this;
+        /*if (par1 == 1)
+            return Item.goldNugget.itemID;*/
+        return Item.getItemFromBlock(TRepo.oreGravel);
     }
 
     @Override
-    public void getSubBlocks (Item b, CreativeTabs tab, List list)
+    public void getSubBlocks (Item id, CreativeTabs tab, List list)
     {
         for (int iter = 0; iter < 6; iter++)
         {
-            list.add(new ItemStack(b, 1, iter));
+            list.add(new ItemStack(id, 1, iter));
         }
     }
-}
+}

src/main/java/tconstruct/blocks/LavaTankBlock.java

@@ -58,6 +58,7 @@ public class LavaTankBlock extends BlockContainer
         return textureNames;
     }
 
+    @Override
     public void registerBlockIcons (IIconRegister IIconRegister)
     {
         String[] textureNames = getTextureNames();
@@ -116,6 +117,7 @@ public class LavaTankBlock extends BlockContainer
         return TankRender.tankModelID;
     }
 
+    @Override
     public IIcon getIcon (int side, int meta)
     {
         if (meta >= 3)
@@ -243,6 +245,7 @@ public class LavaTankBlock extends BlockContainer
     }
 
     /* Data */
+    @Override
     public int damageDropped (int meta)
     {
         return meta;
@@ -294,6 +297,7 @@ public class LavaTankBlock extends BlockContainer
         }
     }
 
+    @Override
     public void harvestBlock (World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6)
     {
 

src/main/java/tconstruct/blocks/MeatBlock.java

@@ -67,6 +67,7 @@ public class MeatBlock extends BlockWood
         }
     }
 
+    @Override
     public Item getItemDropped (int par1, Random par2Random, int par3)
     {
         return new ItemStack(this).getItem();
@@ -105,6 +106,7 @@ public class MeatBlock extends BlockWood
      * Called when a block is placed using its ItemBlock. Args: World, X, Y, Z,
      * side, hitX, hitY, hitZ, block metadata
      */
+    @Override
     public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9)
     {
         int j1 = par9 & 3;
@@ -132,6 +134,7 @@ public class MeatBlock extends BlockWood
      * Determines the damage on the item the block drops. Used in cloth and
      * wood.
      */
+    @Override
     public int damageDropped (int par1)
     {
         return par1 & 3;
@@ -145,6 +148,7 @@ public class MeatBlock extends BlockWood
         return par0 & 3;
     }
 
+    @Override
     protected ItemStack createStackedBlock (int par1)
     {
         return new ItemStack(this, 1, limitToValidMetadata(par1));

src/main/java/tconstruct/blocks/MetalOre.java

@@ -15,6 +15,7 @@ public class MetalOre extends TConstructBlock
         super(material, hardness, tex);
     }
 
+    @Override
     public float getBlockHardness (World world, int x, int y, int z)
     {
         int meta = world.getBlockMetadata(x, y, z);

src/main/java/tconstruct/blocks/MultiBrick.java

@@ -60,6 +60,7 @@ public class MultiBrick extends TConstructBlock
         }
     }
 
+    @Override
     public float getExplosionResistance (Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ)
     {
         int meta = world.getBlockMetadata(x, y, z);

src/main/java/tconstruct/blocks/MultiBrickFancy.java

@@ -64,6 +64,7 @@ public class MultiBrickFancy extends TConstructBlock
         }
     }
 
+    @Override
     public float getExplosionResistance (Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ)
     {
         int meta = world.getBlockMetadata(x, y, z);

src/main/java/tconstruct/blocks/OreberryBush.java

@@ -127,6 +127,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
         }
     }
 
+    @Override
     public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z)
     {
         int l = world.getBlockMetadata(x, y, z);
@@ -231,11 +232,13 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
         return false;
     }
 
+    @Override
     public int getRenderType ()
     {
         return OreberryRender.model;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int x, int y, int z, int meta)
     {
@@ -284,6 +287,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
         return super.canSustainPlant(world, x, y, z, direction, plant);
     }
 
+    @Override
     public boolean canPlaceBlockAt (World world, int x, int y, int z)
     {
         if (world.getFullBlockLightValue(x, y, z) < 13)

src/main/java/tconstruct/blocks/OreberryBushEssence.java

@@ -41,6 +41,7 @@ public class OreberryBushEssence extends OreberryBush implements IPlantable
         }
     }
 
+    @Override
     public boolean canPlaceBlockAt (World world, int x, int y, int z)
     {
         return true;

src/main/java/tconstruct/blocks/PaneBase.java

@@ -80,21 +80,25 @@ public class PaneBase extends Block
         }
     }
 
+    @Override
     public boolean isOpaqueCube ()
     {
         return false;
     }
 
+    @Override
     public boolean renderAsNormalBlock ()
     {
         return false;
     }
 
+    @Override
     public int getRenderType ()
     {
         return PaneRender.model;
     }
 
+    @Override
     public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int i, int j, int k, int l)
     {
         Block b = iblockaccess.getBlock(i, j, k);
@@ -147,11 +151,13 @@ public class PaneBase extends Block
         }
     }
 
+    @Override
     public void setBlockBoundsForItemRender ()
     {
         setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
     }
 
+    @Override
     public void setBlockBoundsBasedOnState (IBlockAccess iblockaccess, int i, int j, int k)
     {
         float f = 0.4375F;

src/main/java/tconstruct/blocks/SearedBlock.java

@@ -348,6 +348,7 @@ public class SearedBlock extends InventoryBlock
     }
 
     /* Redstone */
+    @Override
     public boolean canConnectRedstone (IBlockAccess world, int x, int y, int z, int side)
     {
         return world.getBlockMetadata(x, y, z) == 1;

src/main/java/tconstruct/blocks/SlabBase.java

@@ -46,11 +46,13 @@ public class SlabBase extends MantleBlock
         super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity);
     }
 
+    @Override
     public void setBlockBoundsForItemRender ()
     {
         setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
     }
 
+    @Override
     public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z)
     {
         int meta = world.getBlockMetadata(x, y, z) / 8;
@@ -59,6 +61,7 @@ public class SlabBase extends MantleBlock
         setBlockBounds(0.0F, minY, 0F, 1.0F, maxY, 1.0F);
     }
 
+    @Override
     public int onBlockPlaced (World par1World, int blockX, int blockY, int blockZ, int side, float clickX, float clickY, float clickZ, int metadata)
     {
         if (side == 1)
@@ -69,11 +72,13 @@ public class SlabBase extends MantleBlock
         return metadata;
     }
 
+    @Override
     public boolean isOpaqueCube ()
     {
         return false;
     }
 
+    @Override
     public boolean renderAsNormalBlock ()
     {
         return false;
@@ -102,6 +107,7 @@ public class SlabBase extends MantleBlock
         }
     }
 
+    @Override
     public int damageDropped (int meta)
     {
         return meta % 8;

src/main/java/tconstruct/blocks/SmelteryBlock.java

@@ -71,6 +71,7 @@ public class SmelteryBlock extends InventoryBlock
         return textureNames;
     }
 
+    @Override
     public IIcon getIcon (int side, int meta)
     {
         if (meta < 2)
@@ -91,6 +92,7 @@ public class SmelteryBlock extends InventoryBlock
         return icons[3 + meta];
     }
 
+    @Override
     public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side)
     {
         TileEntity logic = world.getTileEntity(x, y, z);
@@ -140,11 +142,13 @@ public class SmelteryBlock extends InventoryBlock
      * @Override public int getRenderBlockPass() { return 1; }
      */
 
+    @Override
     public int damageDropped (int meta)
     {
         return meta;
     }
 
+    @Override
     public int quantityDropped (Random random)
     {
         return 1;
@@ -157,6 +161,7 @@ public class SmelteryBlock extends InventoryBlock
         return TConstruct.proxy.smelteryGuiID;
     }
 
+    @Override
     public void randomDisplayTick (World world, int x, int y, int z, Random random)
     {
         if (isActive(world, x, y, z))
@@ -195,6 +200,7 @@ public class SmelteryBlock extends InventoryBlock
         }
     }
 
+    @Override
     public int getLightValue (IBlockAccess world, int x, int y, int z)
     {
         return !isActive(world, x, y, z) ? 0 : 9;

src/main/java/tconstruct/blocks/SoilBlock.java

@@ -41,6 +41,7 @@ public class SoilBlock extends TConstructBlock
         }
     }
 
+    @Override
     public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
     {
         int meta = world.getBlockMetadata(x, y, z);
@@ -56,6 +57,7 @@ public class SoilBlock extends TConstructBlock
         }
     }
 
+    @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
     {
         return Blocks.soul_sand.getCollisionBoundingBoxFromPool(world, x, y, z);

src/main/java/tconstruct/blocks/StoneTorch.java

@@ -33,6 +33,7 @@ public class StoneTorch extends MantleBlock
      * Returns a bounding box from the pool of bounding boxes (this means this
      * box can change after the pool has been cleared to be reused)
      */
+    @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int par2, int par3, int par4)
     {
         return null;
@@ -43,6 +44,7 @@ public class StoneTorch extends MantleBlock
      * 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;
@@ -52,6 +54,7 @@ public class StoneTorch extends MantleBlock
      * 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;
@@ -60,6 +63,7 @@ public class StoneTorch extends MantleBlock
     /**
      * The type of render function that is called for this block
      */
+    @Override
     public int getRenderType ()
     {
         return 2;
@@ -85,6 +89,7 @@ public class StoneTorch extends MantleBlock
      * Checks to see if its valid to put this block at the specified
      * coordinates. Args: world, x, y, z
      */
+    @Override
     public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4)
     {
         return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true)
@@ -95,6 +100,7 @@ public class StoneTorch extends MantleBlock
      * Called when a block is placed using its ItemBlock. Args: World, X, Y, Z,
      * side, hitX, hitY, hitZ, block metadata
      */
+    @Override
     public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9)
     {
         int j1 = par9;
@@ -151,6 +157,7 @@ public class StoneTorch extends MantleBlock
         return j1;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons (IIconRegister par1IconRegister)
     {
@@ -242,6 +249,7 @@ public class StoneTorch extends MantleBlock
      * Ray traces through the blocks collision from start vector to end vector
      * returning a ray trace hit. Args: world, x, y, z, startVec, endVec
      */
+    @Override
     public MovingObjectPosition collisionRayTrace (World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3)
     {
         int l = par1World.getBlockMetadata(par2, par3, par4) & 7;
@@ -272,6 +280,7 @@ public class StoneTorch extends MantleBlock
         return super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3);
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     /**
      * A randomly called display update to be able to add particles or other items for display

src/main/java/tconstruct/blocks/TankAirBlock.java

@@ -68,6 +68,7 @@ public class TankAirBlock extends BlockContainer
         return null;
     }
 
+    @Override
     public MovingObjectPosition collisionRayTrace (World world, int x, int y, int z, Vec3 par5Vec3, Vec3 par6Vec3)
     {
         TankAirLogic tank = (TankAirLogic) world.getTileEntity(x, y, z);

src/main/java/tconstruct/blocks/ToolStationBlock.java

@@ -36,7 +36,7 @@ public class ToolStationBlock extends InventoryBlock
         this.setStepSound(Block.soundTypeWood);
     }
 
-    // Block.hasComparatorInputOverride and Block.getComparatorInputOverride
+    //Block.hasComparatorInputOverride and Block.getComparatorInputOverride
 
     /* Rendering */
     @Override
@@ -108,6 +108,7 @@ public class ToolStationBlock extends InventoryBlock
         return true;
     }
 
+    @Override
     public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z)
     {
         int metadata = world.getBlockMetadata(x, y, z);
@@ -150,9 +151,8 @@ public class ToolStationBlock extends InventoryBlock
             return new StencilTableLogic();
         case 13:
             return new StencilTableLogic();
-            /*
-             * case 14: return new CastingTableLogic();
-             */
+            /*case 14:
+            	return new CastingTableLogic();*/
         default:
             return null;
         }
@@ -171,7 +171,7 @@ public class ToolStationBlock extends InventoryBlock
         else
             return 3;
 
-        // return -1;
+        //return -1;
     }
 
     @Override

src/main/java/tconstruct/blocks/WoodRail.java

@@ -20,6 +20,7 @@ public class WoodRail extends BlockRailBase
         super(false);
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     /**
      * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
@@ -29,6 +30,7 @@ public class WoodRail extends BlockRailBase
         return par2 >= 6 ? this.theIcon : this.blockIcon;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     /**
      * When this method is called, your block should register all the icons it needs with the given IconRegister. This

src/main/java/tconstruct/blocks/component/SmelteryComponent.java

@@ -261,6 +261,7 @@ public class SmelteryComponent extends LogicComponent
     }
 
     /* NBT */
+    @Override
     public void readNetworkNBT (NBTTagCompound tags)
     {
         activeTemps = tags.getIntArray("Temperature");
@@ -271,6 +272,7 @@ public class SmelteryComponent extends LogicComponent
             activeLavaTank = new CoordTuple(tank[0], tank[1], tank[2]);
     }
 
+    @Override
     public void writeNetworkNBT (NBTTagCompound tags)
     {
         tags.setIntArray("Temperature", activeTemps);

src/main/java/tconstruct/blocks/component/SmelteryScan.java

@@ -29,6 +29,7 @@ public class SmelteryScan extends TankLayerScan
         super.checkValidStructure();
     }
 
+    @Override
     protected boolean checkAir (int x, int y, int z)
     {
         Block block = world.getBlock(x, y, z);

src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java

@@ -20,6 +20,7 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl
 {
     byte direction;
 
+    @Override
     public boolean canUpdate ()
     {
         return false;
@@ -149,6 +150,7 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl
         }
     }
 
+    @Override
     public void readFromNBT (NBTTagCompound tags)
     {
         super.readFromNBT(tags);

src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java

@@ -58,6 +58,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc
         return smeltery;
     }
 
+    @Override
     public void updateEntity ()
     {
         tick++;

src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java

@@ -198,6 +198,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl
         needsUpdate = true;
     }
 
+    @Override
     public ItemStack decrStackSize (int slot, int quantity)
     {
         ItemStack stack = super.decrStackSize(slot, quantity);

src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java

@@ -345,7 +345,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui
         }
     }
 
-    private HashMap getOutputs ()
+    public HashMap getOutputs ()
     {
         HashMap map = new HashMap();
         TileEntity tankXplus = this.worldObj.getTileEntity(this.xCoord + 1, this.yCoord, this.zCoord);
@@ -404,6 +404,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui
         return map;
     }
 
+    @Override
     public int fill (FluidStack stack, boolean doFill)
     {
         if (stack == null)
@@ -465,6 +466,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui
         return filled;
     }
 
+    @Override
     public FluidStack drain (int maxDrain, boolean doDrain)
     {
         if ((this.liquid == null))

src/main/java/tconstruct/blocks/logic/CastingTableLogic.java

@@ -198,6 +198,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl
         needsUpdate = true;
     }
 
+    @Override
     public ItemStack decrStackSize (int slot, int quantity)
     {
         ItemStack stack = super.decrStackSize(slot, quantity);

src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java

@@ -78,6 +78,7 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent
         return "crafters.CraftingStation";
     }
 
+    @Override
     public boolean canDropInventorySlot (int slot)
     {
         if (slot == 0)

src/main/java/tconstruct/blocks/logic/DryingRackLogic.java

@@ -118,6 +118,7 @@ public class DryingRackLogic extends InventoryLogic
         worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public AxisAlignedBB getRenderBoundingBox ()
     {

src/main/java/tconstruct/blocks/logic/EquipLogic.java

@@ -51,6 +51,7 @@ public abstract class EquipLogic extends InventoryLogic
         return slot != 0 ? inventory[slot] : null;
     }
 
+    @Override
     public boolean isStackInSlot (int slot)
     {
         return slot != 0 ? inventory[slot] != null : false;

src/main/java/tconstruct/blocks/logic/FrypanLogic.java

@@ -79,6 +79,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic
     }
 
     /* Item cooking */
+    @Override
     public void updateEntity ()
     {
         boolean burning = isBurning();
@@ -272,6 +273,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic
     }
 
     /* NBT */
+    @Override
     public void readFromNBT (NBTTagCompound tags)
     {
         super.readFromNBT(tags);
@@ -280,6 +282,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic
         fuelGague = tags.getInteger("FuelGague");
     }
 
+    @Override
     public void writeToNBT (NBTTagCompound tags)
     {
         super.writeToNBT(tags);

src/main/java/tconstruct/blocks/logic/FurnaceLogic.java

@@ -89,6 +89,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin
     }
 
     /* Item cooking */
+    @Override
     public void updateEntity ()
     {
         boolean burning = isBurning();
@@ -255,6 +256,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin
     }
 
     /* NBT */
+    @Override
     public void readFromNBT (NBTTagCompound tags)
     {
         super.readFromNBT(tags);
@@ -264,6 +266,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin
         readNetworkNBT(tags);
     }
 
+    @Override
     public void writeToNBT (NBTTagCompound tags)
     {
         super.writeToNBT(tags);

src/main/java/tconstruct/blocks/logic/LavaTankLogic.java

@@ -124,6 +124,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler
         writeCustomNBT(tags);
     }
 
+    @Override
     public void readCustomNBT (NBTTagCompound tags)
     {
         if (tags.getBoolean("hasFluid"))
@@ -132,6 +133,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler
             tank.setFluid(null);
     }
 
+    @Override
     public void writeCustomNBT (NBTTagCompound tags)
     {
         FluidStack liquid = tank.getFluid();
@@ -160,6 +162,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler
     }
 
     /* Updating */
+    @Override
     public boolean canUpdate ()
     {
         return true;

src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java

@@ -10,6 +10,7 @@ public class LiquidTextureLogic extends TileEntity
 {
     int texturePos;
 
+    @Override
     public boolean canUpdate ()
     {
         return false;
@@ -26,6 +27,7 @@ public class LiquidTextureLogic extends TileEntity
         return texturePos;
     }
 
+    @Override
     public void readFromNBT (NBTTagCompound tags)
     {
         super.readFromNBT(tags);
@@ -37,6 +39,7 @@ public class LiquidTextureLogic extends TileEntity
         texturePos = tags.getInteger("Texture");
     }
 
+    @Override
     public void writeToNBT (NBTTagCompound tags)
     {
         super.writeToNBT(tags);

src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java

@@ -50,6 +50,7 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory
     }
 
     // Called when emptying a slot, not when another item is placed in it
+    @Override
     public ItemStack decrStackSize (int slotID, int quantity)
     {
         ItemStack returnStack = super.decrStackSize(slotID, quantity);
@@ -113,6 +114,7 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory
     }
 
     // Called when a slot has something placed into it.
+    @Override
     public void setInventorySlotContents (int slot, ItemStack itemstack)
     {
         super.setInventorySlotContents(slot, itemstack);
@@ -151,6 +153,7 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory
     }
 
     /* NBT */
+    @Override
     public void readFromNBT (NBTTagCompound tags)
     {
         super.readFromNBT(tags);
@@ -158,6 +161,7 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory
         craftedBottom = tags.getBoolean("CraftedBottom");
     }
 
+    @Override
     public void writeToNBT (NBTTagCompound tags)
     {
         super.writeToNBT(tags);

src/main/java/tconstruct/blocks/logic/PatternChestLogic.java

@@ -13,6 +13,7 @@ public class PatternChestLogic extends InventoryLogic
         super(30);
     }
 
+    @Override
     public boolean canUpdate ()
     {
         return false;

src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java

@@ -18,6 +18,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl
 {
     byte direction;
 
+    @Override
     public boolean canUpdate ()
     {
         return false;
@@ -155,6 +156,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl
         }
     }
 
+    @Override
     public void readFromNBT (NBTTagCompound tags)
     {
         super.readFromNBT(tags);

src/main/java/tconstruct/blocks/logic/SmelteryLogic.java

@@ -268,6 +268,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
     }
 
     /* Updating */
+    @Override
     public void updateEntity ()
     {
         /*
@@ -666,11 +667,13 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
      * }
      */
 
+    @Override
     public int getInventoryStackLimit ()
     {
         return 1;
     }
 
+    @Override
     public void markDirty ()
     {
         updateTemperatures();
@@ -961,6 +964,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
         return blockID == TRepo.lavaTank || blockID == TRepo.lavaTankNether;
     }
 
+    @Override
     public int getCapacity ()
     {
         return maxLiquid;

src/main/java/tconstruct/blocks/logic/StencilTableLogic.java

@@ -17,6 +17,7 @@ public class StencilTableLogic extends InventoryLogic implements ISidedInventory
         super(2);
     }
 
+    @Override
     public boolean canUpdate ()
     {
         return false;

src/main/java/tconstruct/blocks/logic/TankAirLogic.java

@@ -136,6 +136,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide
      */
 
     // DELETE
+    @Override
     public void updateEntity ()
     {
         worldObj.setBlockToAir(xCoord, yCoord, zCoord);

src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java

@@ -35,6 +35,7 @@ public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory
         return new ToolForgeContainer(inventoryplayer, this);
     }
 
+    @Override
     public void buildTool (String name)
     {
         toolName = name;

src/main/java/tconstruct/blocks/logic/ToolStationLogic.java

@@ -30,6 +30,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
         toolName = "";
     }
 
+    @Override
     public boolean canDropInventorySlot (int slot)
     {
         if (slot == 0)
@@ -55,6 +56,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
         return new ToolStationContainer(inventoryplayer, this);
     }
 
+    @Override
     public void markDirty ()
     {
         buildTool(toolName);
@@ -87,6 +89,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
         buildTool(name);
     }
 
+    @Override
     public boolean canUpdate ()
     {
         return false;

src/main/java/tconstruct/blocks/slime/SlimeFluid.java

@@ -42,6 +42,7 @@ public class SlimeFluid extends BlockFluidClassic
         return flowIcon;
     }
 
+    @Override
     public void updateTick (World world, int x, int y, int z, Random rand)
     {
         super.updateTick(world, x, y, z, rand);

src/main/java/tconstruct/blocks/slime/SlimeGel.java

@@ -25,16 +25,19 @@ public class SlimeGel extends TConstructBlock
         setCreativeTab(TConstructRegistry.blockTab);
     }
 
+    @Override
     public boolean getEnableStats ()
     {
         return false;
     }
 
+    @Override
     public int getMobilityFlag ()
     {
         return 0;
     }
 
+    @Override
     public int damageDropped (int meta)
     {
         return meta;

src/main/java/tconstruct/blocks/slime/SlimeGrass.java

@@ -96,11 +96,13 @@ public class SlimeGrass extends MantleBlock
         return plantType == EnumPlantType.Plains && plant.getPlant(world, x, y + 1, z) != Blocks.tallgrass;
     }
 
+    @Override
     public void onPlantGrow (World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ)
     {
         world.setBlock(x, y, z, TRepo.craftedSoil, 5, 3);
     }
 
+    @Override
     public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random)
     {
         if (!par1World.isRemote)

src/main/java/tconstruct/blocks/slime/SlimeLeaves.java

@@ -33,18 +33,21 @@ public class SlimeLeaves extends BlockLeaves
         this.setHardness(0.3f);
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public int getBlockColor ()
     {
         return 0xffffff;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public int getRenderColor (int par1)
     {
         return 0xffffff;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public int colorMultiplier (IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
     {
@@ -97,6 +100,7 @@ public class SlimeLeaves extends BlockLeaves
     /**
      * Returns the ID of the items to drop on destruction.
      */
+    @Override
     public Item getItemDropped (int par1, Random par2Random, int par3)
     {
         return new ItemStack(TRepo.slimeSapling).getItem();
@@ -106,6 +110,7 @@ public class SlimeLeaves extends BlockLeaves
      * Drops the block items with a specified chance of dropping the specified
      * items
      */
+    @Override
     public void dropBlockAsItemWithChance (World world, int x, int y, int z, int meta, float chance, int fortune)
     {
         if (!world.isRemote)

src/main/java/tconstruct/blocks/slime/SlimeSapling.java

@@ -52,6 +52,7 @@ public class SlimeSapling extends BlockSapling
         return b == Blocks.grass || b == Blocks.dirt || b == TRepo.slimeGrass || b == TRepo.craftedSoil;
     }
 
+    @Override
     public void updateTick (World world, int x, int y, int z, Random random)
     {
         if (world.isRemote)
@@ -114,6 +115,7 @@ public class SlimeSapling extends BlockSapling
             world.setBlock(x, y, z, Blocks.air, md + 8, 3);
     }
 
+    @Override
     public int damageDropped (int i)
     {
         return i % 8;

src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java

@@ -33,6 +33,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable
         setCreativeTab(TConstructRegistry.blockTab);
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     /**
      * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
@@ -58,6 +59,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable
      * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i'
      * (inclusive).
      */
+    @Override
     public int quantityDroppedWithBonus (int par1, Random par2Random)
     {
         return 1 + par2Random.nextInt(par1 * 2 + 1);
@@ -66,6 +68,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable
     /**
      * Get the block's damage value (for use with pick block).
      */
+    @Override
     public int getDamageValue (World par1World, int par2, int par3, int par4)
     {
         return par1World.getBlockMetadata(par2, par3, par4);
@@ -83,6 +86,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable
         }
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     /**
      * When this method is called, your block should register all the icons it needs with the given IconRegister. This

src/main/java/tconstruct/blocks/traps/BarricadeBlock.java

@@ -32,6 +32,7 @@ public class BarricadeBlock extends MantleBlock
         this.setCreativeTab(TConstructRegistry.blockTab);
     }
 
+    @Override
     public IIcon getIcon (int side, int meta)
     {
         return modelBlock.getIcon(2, modelMeta);
@@ -43,31 +44,37 @@ public class BarricadeBlock extends MantleBlock
 
     }
 
+    @Override
     public boolean renderAsNormalBlock ()
     {
         return false;
     }
 
+    @Override
     public boolean isOpaqueCube ()
     {
         return false;
     }
 
+    @Override
     public int getRenderType ()
     {
         return BarricadeRender.model;
     }
 
+    @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int x, int y, int z)
     {
         return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1);
     }
 
+    @Override
     public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int x, int y, int z)
     {
         setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
     }
 
+    @Override
     public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, int meta)
     {
         if (meta % 4 > 0)

src/main/java/tconstruct/blocks/traps/Landmine.java

@@ -35,6 +35,7 @@ public class Landmine extends MantleBlock
         this.setBlockBounds(var5, 0.0F, var5, 1.0F - var5, 0.03125F, 1.0F - var5);
     }
 
+    @Override
     public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side)
     {
         Block block = world.getBlock(x, y - 1, z);
@@ -45,11 +46,13 @@ public class Landmine extends MantleBlock
         return Blocks.sponge.getIcon(side, world.getBlockMetadata(x, y, z));
     }
 
+    @Override
     public IIcon getIcon (int side, int meta)
     {
         return Blocks.sponge.getIcon(1, meta);
     }
 
+    @Override
     public void registerBlockIcons (IIconRegister par1IconRegister)
     {
 
@@ -67,6 +70,7 @@ public class Landmine extends MantleBlock
      * Returns a bounding box from the pool of bounding boxes (this means this
      * box can change after the pool has been cleared to be reused)
      */
+    @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int par2, int par3, int par4)
     {
         return null;
@@ -77,6 +81,7 @@ public class Landmine extends MantleBlock
      * 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;
@@ -86,11 +91,13 @@ public class Landmine extends MantleBlock
      * 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;
     }
 
+    @Override
     public boolean getBlocksMovement (IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
     {
         return true;
@@ -100,6 +107,7 @@ public class Landmine extends MantleBlock
      * Checks to see if its valid to put this block at the specified
      * coordinates. Args: world, x, y, z
      */
+    @Override
     public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4)
     {
         return par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || BlockFence.func_149825_a(par1World.getBlock(par2, par3 - 1, par4));
@@ -129,6 +137,7 @@ public class Landmine extends MantleBlock
     /**
      * Ticks the block if it's been scheduled
      */
+    @Override
     public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random)
     {
         if (!par1World.isRemote)
@@ -144,6 +153,7 @@ public class Landmine extends MantleBlock
      * Triggered whenever an entity collides with this block (enters into the
      * block). Args: world, x, y, z, entity
      */
+    @Override
     public void onEntityCollidedWithBlock (World par1World, int par2, int par3, int par4, Entity par5Entity)
     {
         if (!par1World.isRemote)
@@ -241,6 +251,7 @@ public class Landmine extends MantleBlock
      * ejects contained items into the world, and notifies neighbours of an
      * update, as appropriate
      */
+    @Override
     public void breakBlock (World par1World, int par2, int par3, int par4, Block par5, int par6)
     {
         if (par6 > 0)
@@ -256,6 +267,7 @@ public class Landmine extends MantleBlock
      * Updates the blocks bounds based on its current state. Args: world, x, y,
      * z
      */
+    @Override
     public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
     {
         boolean var5 = par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 1;
@@ -274,6 +286,7 @@ public class Landmine extends MantleBlock
     /**
      * Sets the block's bounds for rendering it as an item
      */
+    @Override
     public void setBlockBoundsForItemRender ()
     {
         float var1 = 0.5F;
@@ -286,6 +299,7 @@ public class Landmine extends MantleBlock
      * Returns the mobility information of the block, 0 = free, 1 = can't push
      * but can move over, 2 = total immobility and stop pistons
      */
+    @Override
     public int getMobilityFlag ()
     {
         return 1;

src/main/java/tconstruct/blocks/traps/Punji.java

@@ -86,6 +86,7 @@ public class Punji extends MantleBlock
      * 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;
@@ -95,11 +96,13 @@ public class Punji extends MantleBlock
      * 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;
     }
 
+    @Override
     public int getRenderType ()
     {
         return PunjiRender.model;

src/main/java/tconstruct/client/StepSoundSlime.java

@@ -14,6 +14,7 @@ public class StepSoundSlime extends SoundType
     /**
      * Used when a block breaks, EXA: Player break, Shep eating grass, etc..
      */
+    @Override
     public String getBreakSound ()
     {
         return this.soundName + ".big";

src/main/java/tconstruct/client/TProxyClient.java

@@ -286,6 +286,7 @@ public class TProxyClient extends TProxyCommon
         }
     }
 
+    @Override
     public void registerTickHandler ()
     {
         new TClientTickHandler();
@@ -295,6 +296,7 @@ public class TProxyClient extends TProxyCommon
     }
 
     /* Registers any rendering code. */
+    @Override
     public void registerRenderer ()
     {
         Minecraft mc = Minecraft.getMinecraft();
@@ -358,6 +360,7 @@ public class TProxyClient extends TProxyCommon
     public static Document volume2;
     public static Document smelter;
 
+    @Override
     public void readManuals ()
     {
         DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
@@ -803,6 +806,7 @@ public class TProxyClient extends TProxyCommon
     /* Keybindings */
     public static TControls controlInstance;
 
+    @Override
     public void registerKeys ()
     {
         controlInstance = new TControls();
@@ -829,6 +833,7 @@ public class TProxyClient extends TProxyCommon
         settings.loadOptions();
     }
 
+    @Override
     public void spawnParticle (String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ)
     {
         this.doSpawnParticle(particle, xPos, yPos, zPos, velX, velY, velZ);

src/main/java/tconstruct/client/armor/WingModel.java

@@ -100,6 +100,7 @@ public class WingModel extends ModelBase
         WingBaseLeft.addChild(WingAuxLeft);
     }
 
+    @Override
     public void render (Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
     {
         super.render(entity, f, f1, f2, f3, f4, f5);
@@ -115,6 +116,7 @@ public class WingModel extends ModelBase
         model.rotateAngleZ = z;
     }
 
+    @Override
     public void setRotationAngles (float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
     {
         super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);

src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java

@@ -1,5 +1,7 @@
 package tconstruct.client.block;
 
+import java.util.Set;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
@@ -7,6 +9,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
 
 import org.lwjgl.opengl.GL11;
 
@@ -25,27 +28,27 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler
     @Override
     public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
     {
-        // Floor
+        //Floor
         renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D);
         this.renderStandardBlock(block, metadata, renderer);
-        // Channel Z-
+        //Channel Z-
         renderer.setRenderBounds(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D);
         this.renderStandardBlock(block, metadata, renderer);
         renderer.setRenderBounds(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D);
         this.renderStandardBlock(block, metadata, renderer);
         renderer.setRenderBounds(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D);
         this.renderStandardBlock(block, metadata, renderer);
-        // Channel Z+
+        //Channel Z+
         renderer.setRenderBounds(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D);
         this.renderStandardBlock(block, metadata, renderer);
         renderer.setRenderBounds(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D);
         this.renderStandardBlock(block, metadata, renderer);
         renderer.setRenderBounds(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D);
         this.renderStandardBlock(block, metadata, renderer);
-        // Wall X-
+        //Wall X-
         renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.6875D);
         this.renderStandardBlock(block, metadata, renderer);
-        // Wall X+
+        //Wall X+
         renderer.setRenderBounds(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.6875D);
         this.renderStandardBlock(block, metadata, renderer);
     }
@@ -57,16 +60,15 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler
         {
             CastingChannelLogic tile = (CastingChannelLogic) world.getTileEntity(x, y, z);
 
-            if (!tile.hasTankConnected(ForgeDirection.DOWN))// CentrePiece,
-                                                            // floor is removed
-                                                            // if tank below is
-                                                            // found
+            Set<ForgeDirection> outputs = tile.getOutputs().keySet();
+
+            if (!outputs.contains(ForgeDirection.DOWN))//CentrePiece, floor is removed if tank below is found
             {
                 renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D);
                 renderer.renderStandardBlock(block, x, y, z);
             }
             else
-            // "Guiding Borders" when tank below is found
+            //"Guiding Borders" when tank below is found
             {
                 renderer.setRenderBounds(0.375D, 0.125D, 0.3125D, 0.625D, 0.5D, 0.375D);
                 renderer.renderStandardBlock(block, x, y, z);
@@ -77,17 +79,7 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler
                 renderer.setRenderBounds(0.625D, 0.125D, 0.3125D, 0.6875D, 0.5D, 0.6875D);
                 renderer.renderStandardBlock(block, x, y, z);
             }
-            /*
-             * renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.375D,
-             * 0.625D, 0.375D); renderer.renderStandardBlock(block, x, y, z);
-             * renderer.setRenderBounds(0.3125D, 0.375D, 0.625D, 0.375D, 0.625D,
-             * 0.6875D); renderer.renderStandardBlock(block, x, y, z);
-             * renderer.setRenderBounds(0.625D, 0.375D, 0.3125D, 0.6875D,
-             * 0.625D, 0.375D); renderer.renderStandardBlock(block, x, y, z);
-             * renderer.setRenderBounds(0.625D, 0.375D, 0.625D, 0.6875D, 0.625D,
-             * 0.6875D); renderer.renderStandardBlock(block, x, y, z);
-             */
-            if (tile.hasTankConnected(ForgeDirection.NORTH))// Channel to Z-
+            if (outputs.contains(ForgeDirection.NORTH))//Channel to Z-
             {
                 renderer.setRenderBounds(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D);
                 renderer.renderStandardBlock(block, x, y, z);
@@ -97,13 +89,13 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler
                 renderer.renderStandardBlock(block, x, y, z);
             }
             else
-            // Wall to Z-
+            //Wall to Z-
             {
                 renderer.setRenderBounds(0.375D, 0.5D, 0.3125D, 0.625D, 0.625D, 0.375D);
                 renderer.renderStandardBlock(block, x, y, z);
             }
 
-            if (tile.hasTankConnected(ForgeDirection.SOUTH))// Channel to Z+
+            if (outputs.contains(ForgeDirection.SOUTH))//Channel to Z+
             {
                 renderer.setRenderBounds(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D);
                 renderer.renderStandardBlock(block, x, y, z);
@@ -113,13 +105,13 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler
                 renderer.renderStandardBlock(block, x, y, z);
             }
             else
-            // Wall to Z+
+            //Wall to Z+
             {
                 renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 0.6875D);
                 renderer.renderStandardBlock(block, x, y, z);
             }
 
-            if (tile.hasTankConnected(ForgeDirection.WEST))// Channel to X-
+            if (outputs.contains(ForgeDirection.WEST))//Channel to X-
             {
                 renderer.setRenderBounds(0D, 0.375D, 0.3125D, 0.3125D, 0.5D, 0.6875D);
                 renderer.renderStandardBlock(block, x, y, z);
@@ -129,13 +121,13 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler
                 renderer.renderStandardBlock(block, x, y, z);
             }
             else
-            // Wall to X-
+            //Wall to X-
             {
                 renderer.setRenderBounds(0.3125D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.6875D);
                 renderer.renderStandardBlock(block, x, y, z);
             }
 
-            if (tile.hasTankConnected(ForgeDirection.EAST))// Channel to X+
+            if (outputs.contains(ForgeDirection.EAST))//Channel to X+
             {
                 renderer.setRenderBounds(0.6875D, 0.375D, 0.3125D, 1D, 0.5D, 0.6875D);
                 renderer.renderStandardBlock(block, x, y, z);
@@ -145,171 +137,63 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler
                 renderer.renderStandardBlock(block, x, y, z);
             }
             else
-            // Wall to X+
+            //Wall to X+
             {
                 renderer.setRenderBounds(0.625D, 0.5D, 0.3125D, 0.6875D, 0.625D, 0.6875D);
                 renderer.renderStandardBlock(block, x, y, z);
             }
-
-            if (tile.liquid != null)
+            FluidTankInfo tankMain = tile.getTankInfo(null)[0];
+            if (tankMain.fluid != null)
             {
-                float height = tile.getLiquidAmount() / (tile.getCapacity() * 1.05F);
-                float j = tile.liquid.amount / tile.fillMax;
+                float liquidAmount = (float) tankMain.fluid.amount / (float) tankMain.capacity * 0.125f;
                 double startY = tile.tankBelow();
-                // if(tile.nearbyChannel(ForgeDirection.DOWN))startY = -0.5D;
-                // else if(tile.hasTankConnected(ForgeDirection.DOWN))startY =
-                // 0D;
-                float liquidAmount = tile.liquid.amount / 288f * 0.125f;
-                renderer.setRenderBounds(0.375D, startY, 0.375D, 0.625D, 0.5 + liquidAmount, 0.625D); // Center
-                renderLiquidPart(world, x, y, z, block, renderer, tile);
-                // TConstruct.logger.info(tile.recentlyFilledDelay);
-
-                if (tile.hasTankConnected(ForgeDirection.NORTH))
-                {
-                    if (tile.lastProvider == ForgeDirection.NORTH)
-                    {
-                        renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D);
-                        renderLiquidPart(world, x, y, z, block, renderer, tile);
-                    }
-                    else
-                    {
-                        if (tile.recentlyFilledDelay == 0)
-                        {
-                            renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D);
-                            renderLiquidPart(world, x, y, z, block, renderer, tile);
-                        }
-                    }
-                }
-                if (tile.hasTankConnected(ForgeDirection.SOUTH))
-                {
-                    if (tile.lastProvider == ForgeDirection.SOUTH)
-                    {
-                        renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D);
-                        renderLiquidPart(world, x, y, z, block, renderer, tile);
-                    }
-                    else
-                    {
-                        if (tile.recentlyFilledDelay == 0)
-                        {
-                            renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D);
-                            renderLiquidPart(world, x, y, z, block, renderer, tile);
-                        }
-                    }
-                }
-                if (tile.hasTankConnected(ForgeDirection.WEST))
-                {
-                    if (tile.lastProvider == ForgeDirection.WEST)
-                    {
-                        renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D);
-                        renderLiquidPart(world, x, y, z, block, renderer, tile);
-                    }
-                    else
-                    {
-                        if (tile.recentlyFilledDelay == 0)
-                        {
-                            renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D);
-                            renderLiquidPart(world, x, y, z, block, renderer, tile);
-                        }
-                    }
-                }
-                if (tile.hasTankConnected(ForgeDirection.EAST))
-                {
-                    if (tile.lastProvider == ForgeDirection.EAST)
-                    {
-                        renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D);
-                        renderLiquidPart(world, x, y, z, block, renderer, tile);
-                    }
-                    else
-                    {
-                        if (tile.recentlyFilledDelay == 0)
-                        {
-                            renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D);
-                            renderLiquidPart(world, x, y, z, block, renderer, tile);
-                        }
-                    }
-
-                }
-                /*
-                 * if(tile.lastProvider==ForgeDirection.UP &&
-                 * tile.recentlyFilledDelay != 0) {
-                 * renderer.setRenderBounds(0.375D, 0.5D, 0.375D, 0.625D, 1D,
-                 * 0.625D); renderLiquidPart(world, x, y, z, block, renderer,
-                 * tile); }
-                 */
-
-                /*
-                 * if(tile.hasTankConnected(ForgeDirection.NORTH)&&tile.lastProvider
-                 * !=ForgeDirection.NORTH)//Channel to Z- {
-                 * if(tile.recentlyFilledDelay == 0 || tile.lastProvider ==
-                 * ForgeDirection.UP) { renderer.setRenderBounds(0.375D, 0.5D,
-                 * 0D, 0.625D, 0.625D, 0.375D); renderLiquidPart(world, x, y, z,
-                 * block, renderer, tile); } if(tile.recentlyFilledDelay != 0 &&
-                 * tile.lastProvider == ForgeDirection.UP) {
-                 * renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D,
-                 * 0.625D); renderLiquidPart(world, x, y, z, block, renderer,
-                 * tile); } }
-                 * if(tile.hasTankConnected(ForgeDirection.SOUTH)&&tile
-                 * .lastProvider!=ForgeDirection.SOUTH)//Channel to Z+ {
-                 * if(tile.recentlyFilledDelay == 0 || tile.lastProvider ==
-                 * ForgeDirection.UP) { renderer.setRenderBounds(0.375D, 0.5D,
-                 * 0.625D, 0.625D, 0.625D, 1D); renderLiquidPart(world, x, y, z,
-                 * block, renderer, tile); } if(tile.recentlyFilledDelay != 0 &&
-                 * tile.lastProvider == ForgeDirection.UP) {
-                 * renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D,
-                 * 0.625D); renderLiquidPart(world, x, y, z, block, renderer,
-                 * tile); } }
-                 * if(tile.hasTankConnected(ForgeDirection.WEST)&&tile
-                 * .lastProvider!=ForgeDirection.WEST)//Channel to X- {
-                 * if(tile.recentlyFilledDelay == 0 || tile.lastProvider ==
-                 * ForgeDirection.UP) { renderer.setRenderBounds(0D, 0.5D,
-                 * 0.375D, 0.375D, 0.625D, 0.625D); renderLiquidPart(world, x,
-                 * y, z, block, renderer, tile); } if(tile.recentlyFilledDelay
-                 * != 0 && tile.lastProvider == ForgeDirection.UP) {
-                 * renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D,
-                 * 0.625D); renderLiquidPart(world, x, y, z, block, renderer,
-                 * tile); } }
-                 * if(tile.hasTankConnected(ForgeDirection.EAST)&&tile
-                 * .lastProvider!=ForgeDirection.EAST)//Channel to X+ {
-                 * if(tile.recentlyFilledDelay == 0 || tile.lastProvider ==
-                 * ForgeDirection.UP) { renderer.setRenderBounds(0.625D, 0.5D,
-                 * 0.375D, 1D, 0.625D, 0.625D); renderLiquidPart(world, x, y, z,
-                 * block, renderer, tile); } if(tile.recentlyFilledDelay != 0 &&
-                 * tile.lastProvider == ForgeDirection.UP) {
-                 * renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D,
-                 * 0.625D); renderLiquidPart(world, x, y, z, block, renderer,
-                 * tile); } } if(tile.lastProvider==ForgeDirection.NORTH &&
-                 * tile.recentlyFilledDelay != 0) {
-                 * renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D,
-                 * 0.625D, 1D); renderLiquidPart(world, x, y, z, block,
-                 * renderer, tile); } if(tile.lastProvider==ForgeDirection.SOUTH
-                 * && tile.recentlyFilledDelay != 0) {
-                 * renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.625D,
-                 * 0.375D); renderLiquidPart(world, x, y, z, block, renderer,
-                 * tile); } if(tile.lastProvider==ForgeDirection.WEST &&
-                 * tile.recentlyFilledDelay != 0) {
-                 * renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.625D,
-                 * 0.625D); renderLiquidPart(world, x, y, z, block, renderer,
-                 * tile); } if(tile.lastProvider==ForgeDirection.EAST &&
-                 * tile.recentlyFilledDelay != 0) { renderer.setRenderBounds(0D,
-                 * 0.5D, 0.375D, 0.375D, 0.625D, 0.625D);
-                 * renderLiquidPart(world, x, y, z, block, renderer, tile); }
-                 */
+                renderer.setRenderBounds(0.375D, startY, 0.375D, 0.625D, 0.5 + liquidAmount, 0.625D); //Center
+                renderLiquidPart(world, x, y, z, block, renderer, tankMain.fluid, false);
+            }
+            for (ForgeDirection dir : outputs)
+            {
+                double[] bounds = getRenderboundsForLiquid(dir);
+                if (bounds == null)
+                    break;
+                FluidTankInfo tankSub = tile.getTankInfo(dir)[0];
+                if (tankSub == null || tankSub.fluid == null)
+                    break;
+                float liquidAmount = (float) tankSub.fluid.amount / (float) tankSub.capacity * 0.125f / 2;
+                renderer.setRenderBounds(bounds[0], 0.5, bounds[1], bounds[2], 0.5 + liquidAmount, bounds[3]);
+                renderLiquidPart(world, x, y, z, block, renderer, tankSub.fluid, true);
             }
-
         }
         return true;
     }
 
-    private void renderLiquidPart (IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer, CastingChannelLogic logic)
+    private double[] getRenderboundsForLiquid (ForgeDirection dir)
+    {
+        switch (dir)
+        {
+        case NORTH:
+            return new double[] { 0.375, 0, 0.625, 0.375 };
+        case SOUTH:
+            return new double[] { 0.375, 0.625, 0.625, 1 };
+        case WEST:
+            return new double[] { 0, 0.375, 0.375, 0.625 };
+        case EAST:
+            return new double[] { 0.625, 0.375, 1, 0.625 };
+        default:
+            return null;
+        }
+    }
+
+    private void renderLiquidPart (IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer, FluidStack fluidStack, boolean useFlowingTexture)
     {
-        FluidStack liquid = logic.liquid;
         int color = block.colorMultiplier(world, x, y, z);
         float red = (color >> 16 & 0xFF) / 255.0F;
         float green = (color >> 8 & 0xFF) / 255.0F;
         float blue = (color & 0xFF) / 255.0F;
-        Fluid fluid = liquid.getFluid();
-        if (fluid.canBePlacedInWorld())
+        Fluid fluid = fluidStack.getFluid();
+        if (fluid.canBePlacedInWorld() && !useFlowingTexture)
             BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, x, y, z, renderer, world);
+        else if (useFlowingTexture)
+            BlockSkinRenderHelper.renderLiquidBlock(fluid.getFlowingIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world);
         else
             BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world);
     }
@@ -348,7 +232,6 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler
     @Override
     public boolean shouldRender3DInInventory (int modelID)
     {
-        // TODO Auto-generated method stub
         return true;
     }
 
@@ -357,4 +240,4 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler
     {
         return renderID;
     }
-}
+}

src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java

@@ -8,11 +8,13 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
+import tconstruct.TConstruct;
 
 public class BlockSkinRenderHelper
 {
     public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
     {
+        TConstruct.logger.error(block);
         // TODO CHECK THESE!!!!
         int var5 = block.colorMultiplier(world, x, y, z);
         float var6 = (float) (var5 >> 16 & 255) / 255.0F;

src/main/java/tconstruct/client/block/BreakingFX.java

@@ -36,11 +36,13 @@ public class BreakingFX extends EntityFX
         this.motionZ += par12;
     }
 
+    @Override
     public int getFXLayer ()
     {
         return 2;
     }
 
+    @Override
     public void renderParticle (Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
     {
         float f6 = ((float) this.particleTextureIndexX + this.particleTextureJitterX / 4.0F) / 16.0F;

src/main/java/tconstruct/client/block/RenderLiquid.java

@@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess;
  */
 
 public class RenderLiquid
-{// TODO CHECK THIS!!!!
+{
     public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
     {
         int var5 = block.colorMultiplier(world, x, y, z);
@@ -207,12 +207,12 @@ public class RenderLiquid
 
             if ((!flag4) && (!flag3))
             {
-                render.aoLightValueScratchXYPP = render.aoLightValueScratchXYPP;
+                render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP;
                 render.aoBrightnessXYZPPN = render.aoBrightnessXYPP;
             }
             else
             {
-                render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1);
+                render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1);
                 render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1);
             }
 
@@ -229,12 +229,12 @@ public class RenderLiquid
 
             if ((!flag5) && (!flag3))
             {
-                render.aoLightValueScratchXZNN = render.aoLightValueScratchXYPP;
+                render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP;
                 render.aoBrightnessXYZPPP = render.aoBrightnessXYPP;
             }
             else
             {
-                render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1);
+                render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1);
                 render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1);
             }
 
@@ -252,8 +252,8 @@ public class RenderLiquid
 
             float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
             f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F;
-            f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXZNN + render.aoLightValueScratchXYPP) / 4.0F;
-            f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYPP) / 4.0F;
+            f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F;
+            f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F;
             f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F;
             render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1);
             render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1);
@@ -285,7 +285,7 @@ public class RenderLiquid
                 zPos--;
             }
 
-            render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+            render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
             render.aoLightValueScratchYZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
             render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
             render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
@@ -300,7 +300,7 @@ public class RenderLiquid
 
             if ((!flag2) && (!flag4))
             {
-                render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN;
                 render.aoBrightnessXYZNNN = render.aoBrightnessXZNN;
             }
             else
@@ -311,7 +311,7 @@ public class RenderLiquid
 
             if ((!flag2) && (!flag5))
             {
-                render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN;
                 render.aoBrightnessXYZNPN = render.aoBrightnessXZNN;
             }
             else
@@ -333,12 +333,12 @@ public class RenderLiquid
 
             if ((!flag3) && (!flag5))
             {
-                render.aoLightValueScratchXYPP = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN;
                 render.aoBrightnessXYZPPN = render.aoBrightnessXZPN;
             }
             else
             {
-                render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
+                render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
                 render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos);
             }
 
@@ -355,10 +355,10 @@ public class RenderLiquid
             }
 
             float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
-            f3 = (render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F;
-            f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYPP) / 4.0F;
+            f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F;
+            f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F;
             f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F;
-            f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZPN + render.aoLightValueScratchYZNN + f7) / 4.0F;
+            f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F;
             render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1);
             render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1);
             render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1);
@@ -450,12 +450,12 @@ public class RenderLiquid
 
             if ((!flag3) && (!flag5))
             {
-                render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP;
+                render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP;
                 render.aoBrightnessXYZPPP = render.aoBrightnessXZPP;
             }
             else
             {
-                render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
+                render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
                 render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos);
             }
 
@@ -473,7 +473,7 @@ public class RenderLiquid
 
             float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
             f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F;
-            f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXZNN) / 4.0F;
+            f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F;
             f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F;
             f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F;
             render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1);
@@ -520,7 +520,7 @@ public class RenderLiquid
             }
 
             render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
-            render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+            render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
             render.aoLightValueScratchXZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
             render.aoLightValueScratchXYNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
             render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
@@ -534,7 +534,7 @@ public class RenderLiquid
 
             if ((!flag5) && (!flag2))
             {
-                render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN;
                 render.aoBrightnessXYZNNN = render.aoBrightnessXZNN;
             }
             else
@@ -556,7 +556,7 @@ public class RenderLiquid
 
             if ((!flag5) && (!flag3))
             {
-                render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN;
                 render.aoBrightnessXYZNPN = render.aoBrightnessXZNN;
             }
             else
@@ -591,8 +591,8 @@ public class RenderLiquid
             float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
             f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F;
             f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F;
-            f4 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F;
-            f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZPN + f7) / 4.0F;
+            f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F;
+            f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F;
             render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1);
             render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1);
             render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1);
@@ -673,23 +673,23 @@ public class RenderLiquid
 
             if ((!flag3) && (!flag4))
             {
-                render.aoLightValueScratchXYPP = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN;
                 render.aoBrightnessXYZPPN = render.aoBrightnessXZPN;
             }
             else
             {
-                render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1);
+                render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1);
                 render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1);
             }
 
             if ((!flag3) && (!flag5))
             {
-                render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP;
+                render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP;
                 render.aoBrightnessXYZPPP = render.aoBrightnessXZPP;
             }
             else
             {
-                render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1);
+                render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1);
                 render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1);
             }
 
@@ -708,8 +708,8 @@ public class RenderLiquid
             float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
             f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F;
             f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F;
-            f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYPP) / 4.0F;
-            f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXZNN) / 4.0F;
+            f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F;
+            f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F;
             render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1);
             render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1);
             render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1);
@@ -750,11 +750,6 @@ public class RenderLiquid
         return flag;
     }
 
-    private static float getAmbientOcclusionLightValue (IBlockAccess access, int x, int y, int z)
-    {
-        return access.getBlock(x, y, z).getAmbientOcclusionLightValue();
-    }
-
     static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render,
             IBlockAccess world)
     {
@@ -1023,10 +1018,10 @@ public class RenderLiquid
             render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
             render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
             render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
-            boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
-            boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
-            boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass();
-            boolean flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass();
+            boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass();
+            boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass();
+            boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass();
+            boolean flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass();
 
             if ((!flag4) && (!flag2))
             {
@@ -1041,12 +1036,12 @@ public class RenderLiquid
 
             if ((!flag4) && (!flag3))
             {
-                render.aoLightValueScratchXYPP = render.aoLightValueScratchXYPP;
+                render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP;
                 render.aoBrightnessXYZPPN = render.aoBrightnessXYPP;
             }
             else
             {
-                render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1);
+                render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1);
                 render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1);
             }
 
@@ -1063,12 +1058,12 @@ public class RenderLiquid
 
             if ((!flag5) && (!flag3))
             {
-                render.aoLightValueScratchXZNN = render.aoLightValueScratchXYPP;
+                render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP;
                 render.aoBrightnessXYZPPP = render.aoBrightnessXYPP;
             }
             else
             {
-                render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1);
+                render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1);
                 render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1);
             }
 
@@ -1086,8 +1081,8 @@ public class RenderLiquid
 
             float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
             f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F;
-            f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXZNN + render.aoLightValueScratchXYPP) / 4.0F;
-            f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYPP) / 4.0F;
+            f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F;
+            f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F;
             f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F;
             render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1);
             render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1);
@@ -1119,7 +1114,7 @@ public class RenderLiquid
                 zPos--;
             }
 
-            render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+            render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
             render.aoLightValueScratchYZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
             render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
             render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
@@ -1127,14 +1122,14 @@ public class RenderLiquid
             render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
             render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
             render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
-            boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
-            boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
-            boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass();
-            boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getMaterial().getCanBlockGrass();
+            boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getCanBlockGrass();
+            boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getCanBlockGrass();
+            boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass();
+            boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass();
 
             if ((!flag2) && (!flag4))
             {
-                render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN;
                 render.aoBrightnessXYZNNN = render.aoBrightnessXZNN;
             }
             else
@@ -1145,7 +1140,7 @@ public class RenderLiquid
 
             if ((!flag2) && (!flag5))
             {
-                render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN;
                 render.aoBrightnessXYZNPN = render.aoBrightnessXZNN;
             }
             else
@@ -1167,12 +1162,12 @@ public class RenderLiquid
 
             if ((!flag3) && (!flag5))
             {
-                render.aoLightValueScratchXYPP = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN;
                 render.aoBrightnessXYZPPN = render.aoBrightnessXZPN;
             }
             else
             {
-                render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
+                render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
                 render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos);
             }
 
@@ -1189,10 +1184,10 @@ public class RenderLiquid
             }
 
             float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
-            f3 = (render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F;
-            f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYPP) / 4.0F;
+            f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F;
+            f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F;
             f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F;
-            f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZPN + render.aoLightValueScratchYZNN + f7) / 4.0F;
+            f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F;
             render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1);
             render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1);
             render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1);
@@ -1243,10 +1238,10 @@ public class RenderLiquid
             render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
             render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
             render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
-            boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
-            boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
-            boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass();
-            boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getMaterial().getCanBlockGrass();
+            boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getCanBlockGrass();
+            boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getCanBlockGrass();
+            boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass();
+            boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass();
 
             if ((!flag2) && (!flag4))
             {
@@ -1283,12 +1278,12 @@ public class RenderLiquid
 
             if ((!flag3) && (!flag5))
             {
-                render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP;
+                render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP;
                 render.aoBrightnessXYZPPP = render.aoBrightnessXZPP;
             }
             else
             {
-                render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
+                render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
                 render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos);
             }
 
@@ -1306,7 +1301,7 @@ public class RenderLiquid
 
             float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
             f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F;
-            f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXZNN) / 4.0F;
+            f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F;
             f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F;
             f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F;
             render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1);
@@ -1352,21 +1347,21 @@ public class RenderLiquid
             }
 
             render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
-            render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+            render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
             render.aoLightValueScratchXZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
             render.aoLightValueScratchXYNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
             render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
             render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
             render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
             render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
-            boolean flag3 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
-            boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getMaterial().getCanBlockGrass();
-            boolean flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
-            boolean flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
+            boolean flag3 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass();
+            boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass();
+            boolean flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getCanBlockGrass();
+            boolean flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getCanBlockGrass();
 
             if ((!flag5) && (!flag2))
             {
-                render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN;
                 render.aoBrightnessXYZNNN = render.aoBrightnessXZNN;
             }
             else
@@ -1388,7 +1383,7 @@ public class RenderLiquid
 
             if ((!flag5) && (!flag3))
             {
-                render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN;
                 render.aoBrightnessXYZNPN = render.aoBrightnessXZNN;
             }
             else
@@ -1423,8 +1418,8 @@ public class RenderLiquid
             float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
             f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F;
             f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F;
-            f4 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F;
-            f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZPN + f7) / 4.0F;
+            f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F;
+            f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F;
             render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1);
             render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1);
             render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1);
@@ -1475,10 +1470,10 @@ public class RenderLiquid
             render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
             render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
             render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
-            boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
-            boolean flag2 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getMaterial().getCanBlockGrass();
-            boolean flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
-            boolean flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
+            boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass();
+            boolean flag2 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass();
+            boolean flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getCanBlockGrass();
+            boolean flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getCanBlockGrass();
 
             if ((!flag2) && (!flag4))
             {
@@ -1504,23 +1499,23 @@ public class RenderLiquid
 
             if ((!flag3) && (!flag4))
             {
-                render.aoLightValueScratchXYPP = render.aoLightValueScratchXZPN;
+                render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN;
                 render.aoBrightnessXYZPPN = render.aoBrightnessXZPN;
             }
             else
             {
-                render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1);
+                render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1);
                 render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1);
             }
 
             if ((!flag3) && (!flag5))
             {
-                render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP;
+                render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP;
                 render.aoBrightnessXYZPPP = render.aoBrightnessXZPP;
             }
             else
             {
-                render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1);
+                render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1);
                 render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1);
             }
 
@@ -1539,8 +1534,8 @@ public class RenderLiquid
             float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
             f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F;
             f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F;
-            f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYPP) / 4.0F;
-            f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXZNN) / 4.0F;
+            f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F;
+            f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F;
             render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1);
             render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1);
             render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1);
@@ -1580,6 +1575,11 @@ public class RenderLiquid
         return flag;
     }
 
+    private static float getAmbientOcclusionLightValue (IBlockAccess access, int x, int y, int z)
+    {
+        return access.getBlock(x, y, z).getAmbientOcclusionLightValue();
+    }
+
     static boolean renderFakeBlockWithColorMultiplier (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world)
     {
         Block block = Blocks.stone;
@@ -1672,4 +1672,4 @@ public class RenderLiquid
 
         return flag;
     }
-}
+}

src/main/java/tconstruct/client/block/SmelteryRender.java

@@ -1,6 +1,5 @@
 package tconstruct.client.block;
 
-import mantle.blocks.BlockUtils;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.item.ItemStack;
@@ -47,7 +46,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
         if (logic.validStructure)
         {
             int posX = logic.centerPos.x - 1, posY = logic.centerPos.y, posZ = logic.centerPos.z - 1;
-            // Melting
+            //Melting
             if (logic.getSizeInventory() > 0)
             {
                 for (int i = 0; i < logic.layers; i++)
@@ -56,7 +55,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
                 }
             }
 
-            // Liquids
+            //Liquids
             float base = 0F;
             int yBase = 0;
             int liquidBase = 0;
@@ -70,8 +69,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
                     liquidSize -= countSize;
 
                     float height = countSize > 20000 ? 1.0F : countSize / 20000F;
-                    // renderer.setRenderBounds(0, base, 0, 1, height + base,
-                    // 1);
+                    //renderer.setRenderBounds(0, base, 0, 1, height + base, 1);
                     float renderBase = base;
                     float renderHeight = height + base;
                     base += height;
@@ -90,27 +88,33 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
                         else
                             BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), posX + i % 3, posY + yBase, posZ + i / 3, renderer, world);
                     }
-                    /*
-                     * if (liquid.itemID < 4096) //Block { Block liquidBlock =
-                     * Block.blocksList[liquid.itemID]; for (int i = 0; i < 9;
-                     * i++) { float minX = i % 3 == 0 ? -0.001F : 0F; float minZ
-                     * = i / 3 == 0 ? -0.001F : 0F; float maxX = i % 3 == 2 ?
-                     * 1.001F : 1F; float maxZ = i / 3 == 2 ? 1.001F : 1F;
-                     * renderer.setRenderBounds(minX, renderBase, minZ, maxX,
-                     * renderHeight, maxZ);
-                     * BlockSkinRenderHelper.renderMetadataBlock(liquidBlock,
-                     * liquid.itemMeta, posX + i % 3, posY + yBase, posZ + i /
-                     * 3, renderer, world); } } else //Item { Item liquidItem =
-                     * Item.itemsList[liquid.itemID]; for (int i = 0; i < 9;
-                     * i++) { float minX = i % 3 == 0 ? -0.001F : 0F; float minZ
-                     * = i / 3 == 0 ? -0.001F : 0F; float maxX = i % 3 == 2 ?
-                     * 1.001F : 1F; float maxZ = i / 3 == 2 ? 1.001F : 1F;
-                     * renderer.setRenderBounds(minX, renderBase, minZ, maxX,
-                     * renderHeight, maxZ);
-                     * BlockSkinRenderHelper.renderFakeBlock
-                     * (liquidItem.getIconFromDamage(liquid.itemMeta), posX,
-                     * posY + yBase, posZ, renderer, world); } }
-                     */
+                    /*if (liquid.itemID < 4096) //Block
+                    {
+                        Block liquidBlock = Block.blocksList[liquid.itemID];
+                        for (int i = 0; i < 9; i++)
+                        {
+                            float minX = i % 3 == 0 ? -0.001F : 0F;
+                            float minZ = i / 3 == 0 ? -0.001F : 0F;
+                            float maxX = i % 3 == 2 ? 1.001F : 1F;
+                            float maxZ = i / 3 == 2 ? 1.001F : 1F;
+                            renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ);
+                            BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, liquid.itemMeta, posX + i % 3, posY + yBase, posZ + i / 3, renderer, world);
+                        }
+                    }
+                    else
+                    //Item
+                    {
+                        Item liquidItem = Item.itemsList[liquid.itemID];
+                        for (int i = 0; i < 9; i++)
+                        {
+                            float minX = i % 3 == 0 ? -0.001F : 0F;
+                            float minZ = i / 3 == 0 ? -0.001F : 0F;
+                            float maxX = i % 3 == 2 ? 1.001F : 1F;
+                            float maxZ = i / 3 == 2 ? 1.001F : 1F;
+                            renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ);
+                            BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(liquid.itemMeta), posX, posY + yBase, posZ, renderer, world);
+                        }
+                    }*/
 
                     if (countSize == room)
                     {
@@ -138,28 +142,23 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
                     float blockHeight = input.stackSize / (float) blockToRender.stackSize;
                     renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.0F);
 
-                    // TODO is this needed???
-                    // if (blockToRender.itemID < 4096) //Block
-                    // {
-                    Block liquidBlock = BlockUtils.getBlockFromItemStack(blockToRender);
+                    Block liquidBlock = Block.getBlockFromItem(blockToRender.getItem());
                     BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY, posZ + i / 3, renderer, world);
-                    // }
 
-                    /*
-                     * else //No items, only blocks //Item { Item liquidItem =
-                     * Item.itemsList[blockToRender.itemID]; int metadata =
-                     * blockToRender.getItemDamage();
-                     * BlockSkinRenderHelper.renderFakeBlock
-                     * (liquidItem.getIconFromDamage(metadata), posX + i % 3,
-                     * posY, posZ + i / 3, renderer, world); }
-                     */
+                    /*else //No items, only blocks
+                    //Item                        
+                    {
+                        Item liquidItem = Item.itemsList[blockToRender.itemID];
+                        int metadata = blockToRender.getItemDamage();
+                        BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(metadata), posX + i % 3, posY, posZ + i / 3, renderer, world);
+                    }*/
                 }
             }
         }
     }
 
     @Override
-    public boolean shouldRender3DInInventory (int modelID)
+    public boolean shouldRender3DInInventory (int modelId)
     {
         return true;
     }
@@ -169,4 +168,4 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
     {
         return smelteryModel;
     }
-}
+}

src/main/java/tconstruct/client/block/TankAirRender.java

@@ -1,6 +1,5 @@
 package tconstruct.client.block;
 
-import mantle.blocks.BlockUtils;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.item.ItemBlock;
@@ -21,7 +20,7 @@ public class TankAirRender implements ISimpleBlockRenderingHandler
     @Override
     public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
     {
-        // No inventory block
+        //No inventory block
     }
 
     @Override
@@ -35,7 +34,7 @@ public class TankAirRender implements ISimpleBlockRenderingHandler
                 ItemStack item = logic.getStackInSlot(0);
                 if (item.getItem() instanceof ItemBlock)
                 {
-                    Block inv = BlockUtils.getBlockFromItemStack(item);
+                    Block inv = Block.getBlockFromItem(item.getItem());
                     renderer.setOverrideBlockTexture(inv.getIcon(1, item.getItemDamage()));
                     renderer.renderBlockByRenderType(inv, x, y, z);
                     renderer.clearOverrideBlockTexture();
@@ -47,8 +46,7 @@ public class TankAirRender implements ISimpleBlockRenderingHandler
                 for (FluidStack fluidstack : logic.getFluids())
                 {
                     Fluid fluid = fluidstack.getFluid();
-                    // System.out.println("Base: "+getBaseAmount(base)+", Height: "+getHeightAmount(base,
-                    // fluidstack.amount)+", fluid amount: "+fluidstack.amount);
+                    //System.out.println("Base: "+getBaseAmount(base)+", Height: "+getHeightAmount(base, fluidstack.amount)+", fluid amount: "+fluidstack.amount);
                     renderer.setRenderBounds(0.0, getBaseAmount(base), 0.0, 1.0, getHeightAmount(base, fluidstack.amount), 1.0);
                     if (fluid.canBePlacedInWorld())
                         BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, x, y, z, renderer, world);
@@ -82,4 +80,4 @@ public class TankAirRender implements ISimpleBlockRenderingHandler
     {
         return model;
     }
-}
+}

src/main/java/tconstruct/client/block/TankRender.java

@@ -38,7 +38,7 @@ public class TankRender implements ISimpleBlockRenderingHandler
     {
         if (modelID == tankModelID)
         {
-            // Liquid
+            //Liquid
             LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(x, y, z);
             if (logic.containsFluid())
             {
@@ -53,7 +53,7 @@ public class TankRender implements ISimpleBlockRenderingHandler
                 renderer.setRenderBounds(00, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999);
             }
 
-            // Block
+            //Block
             int meta = world.getBlockMetadata(x, y, z);
             if (meta == 0 && world.getBlock(x, y + 1, z) == Blocks.air)
             {
@@ -108,4 +108,4 @@ public class TankRender implements ISimpleBlockRenderingHandler
         tessellator.draw();
         GL11.glTranslatef(0.5F, 0.5F, 0.5F);
     }
-}
+}

src/main/java/tconstruct/client/entity/CartRender.java

@@ -128,11 +128,13 @@ public class CartRender extends Render
      * void doRender(T entity, double d, double d1, double d2, float f, float
      * f1). But JAD is pre 1.5 so doesn't do that.
      */
+    @Override
     public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
     {
         this.renderPullcart((CartEntity) par1Entity, par2, par4, par6, par8, par9);
     }
 
+    @Override
     protected ResourceLocation getEntityTexture (Entity par1Entity)
     {
         return texture;

src/main/java/tconstruct/client/entity/CrystalRender.java

@@ -65,6 +65,7 @@ public class CrystalRender extends RenderLiving
         return this.func_77061_b((Crystal) par1EntityLiving, par2, par3);
     }
 
+    @Override
     protected ResourceLocation getEntityTexture (Entity par1Entity)
     {
         return texture;

src/main/java/tconstruct/client/entity/FancyItemRender.java

@@ -2,7 +2,6 @@ package tconstruct.client.entity;
 
 import java.util.Random;
 
-import mantle.blocks.BlockUtils;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -30,7 +29,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class FancyItemRender extends Render
 {
-    private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png");
+    private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png");
     private RenderBlocks itemRenderBlocks = new RenderBlocks();
 
     /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */
@@ -72,13 +71,13 @@ public class FancyItemRender extends Render
 
             Block block = null;
 
-            block = BlockUtils.getBlockFromItem(itemstack.getItem());
+            block = Block.getBlockFromItem(itemstack.getItem());
 
             if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c, 1))
             {
                 ;
             }
-            else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType()))
+            else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemstack.getItem()).getRenderType()))
             {
                 GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F);
 
@@ -242,8 +241,7 @@ public class FancyItemRender extends Render
 
         for (int k = 0; k < b0; ++k)
         {
-            // Makes items offset when in 3D, like when in 2D, looks much
-            // better. Considered a vanilla bug...
+            // Makes items offset when in 3D, like when in 2D, looks much better. Considered a vanilla bug...
             if (k > 0 && shouldSpreadItems())
             {
                 float x = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F;
@@ -272,7 +270,7 @@ public class FancyItemRender extends Render
             {
                 GL11.glDepthFunc(GL11.GL_EQUAL);
                 GL11.glDisable(GL11.GL_LIGHTING);
-                this.renderManager.renderEngine.bindTexture(RES_ITEM_GLINT);
+                this.renderManager.renderEngine.bindTexture(field_110798_h);
                 GL11.glEnable(GL11.GL_BLEND);
                 GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE);
                 float f13 = 0.76F;
@@ -321,8 +319,8 @@ public class FancyItemRender extends Render
         int i1;
         float f1;
         float f2;
-        // TODO make this be the block equivalent to k
-        Block block = BlockUtils.getBlockFromItem(k);
+
+        Block block = Block.getBlockFromItem(k);//(k < Block.blocksList.length ? Block.blocksList[k] : null);
         if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(block.getRenderType()))
         {
             par2TextureManager.bindTexture(TextureMap.locationBlocksTexture);
@@ -415,7 +413,7 @@ public class FancyItemRender extends Render
         GL11.glDepthFunc(GL11.GL_GREATER);
         GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glDepthMask(false);
-        manager.bindTexture(RES_ITEM_GLINT);
+        manager.bindTexture(field_110798_h);
         this.zLevel -= 50.0F;
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
@@ -440,20 +438,25 @@ public class FancyItemRender extends Render
                 this.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, true);
             }
 
-            /*
-             * Modders must handle this themselves if they use custom renderers!
-             * if (par3ItemStack.hasEffect()) {
-             * GL11.glDepthFunc(GL11.GL_GREATER);
-             * GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false);
-             * par2TextureManager.bindTexture(RES_ITEM_GLINT); this.zLevel -=
-             * 50.0F; GL11.glEnable(GL11.GL_BLEND);
-             * GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
-             * GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); this.renderGlint(par4 *
-             * 431278612 + par5 * 32178161, par4 - 2, par5 - 2, 20, 20);
-             * GL11.glDisable(GL11.GL_BLEND); GL11.glDepthMask(true);
-             * this.zLevel += 50.0F; GL11.glEnable(GL11.GL_LIGHTING);
-             * GL11.glDepthFunc(GL11.GL_LEQUAL); }
-             */
+            /* Modders must handle this themselves if they use custom renderers!
+            if (par3ItemStack.hasEffect())
+            {
+                GL11.glDepthFunc(GL11.GL_GREATER);
+                GL11.glDisable(GL11.GL_LIGHTING);
+                GL11.glDepthMask(false);
+                par2TextureManager.bindTexture(field_110798_h);
+                this.zLevel -= 50.0F;
+                GL11.glEnable(GL11.GL_BLEND);
+                GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
+                GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F);
+                this.renderGlint(par4 * 431278612 + par5 * 32178161, par4 - 2, par5 - 2, 20, 20);
+                GL11.glDisable(GL11.GL_BLEND);
+                GL11.glDepthMask(true);
+                this.zLevel += 50.0F;
+                GL11.glEnable(GL11.GL_LIGHTING);
+                GL11.glDepthFunc(GL11.GL_LEQUAL);
+            }
+            */
         }
     }
 
@@ -494,8 +497,8 @@ public class FancyItemRender extends Render
     }
 
     /**
-     * Renders the item's overlay information. Examples being stack count or
-     * damage on top of the item's image at the specified position.
+     * Renders the item's overlay information. Examples being stack count or damage on top of the item's image at the
+     * specified position.
      */
     public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5)
     {
@@ -538,8 +541,8 @@ public class FancyItemRender extends Render
     }
 
     /**
-     * Adds a quad to the tesselator at the specified position with the set
-     * width and height and color. Args: tessellator, x, y, width, height, color
+     * Adds a quad to the tesselator at the specified position with the set width and height and color.  Args:
+     * tessellator, x, y, width, height, color
      */
     private void renderQuad (Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6)
     {
@@ -563,19 +566,19 @@ public class FancyItemRender extends Render
         tessellator.draw();
     }
 
+    @Override
     protected ResourceLocation getEntityTexture (Entity par1Entity)
     {
         return this.func_110796_a((EntityItem) par1Entity);
     }
 
     /**
-     * Actually renders the given argument. This is a synthetic bridge method,
-     * always casting down its argument and then handing it off to a worker
-     * function which does the actual work. In all probabilty, the class Render
-     * is generic (Render<T extends Entity) and this method has signature public
-     * void doRender(T entity, double d, double d1, double d2, float f, float
-     * f1). But JAD is pre 1.5 so doesn't do that.
+     * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+     * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+     * (Render<T extends Entity) and this method has signature public void doRender(T entity, double d, double d1,
+     * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
      */
+    @Override
     public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
     {
         this.doRenderItem((EntityItem) par1Entity, par2, par4, par6, par8, par9);
@@ -583,7 +586,6 @@ public class FancyItemRender extends Render
 
     /**
      * Items should spread out when rendered in 3d?
-     * 
      * @return
      */
     public boolean shouldSpreadItems ()
@@ -593,7 +595,6 @@ public class FancyItemRender extends Render
 
     /**
      * Items should have a bob effect
-     * 
      * @return
      */
     public boolean shouldBob ()
@@ -618,7 +619,6 @@ public class FancyItemRender extends Render
     /**
      * Allows for a subclass to override how many rendered items appear in a
      * "mini item 3d stack"
-     * 
      * @param stack
      * @return
      */
@@ -633,4 +633,4 @@ public class FancyItemRender extends Render
             ret = 4;
         return ret;
     }
-}
+}

src/main/java/tconstruct/client/entity/ModelPullcart.java

@@ -219,6 +219,7 @@ public class ModelPullcart extends ModelBase
         setRotation(WheelLeft12, 0F, 0F, 0F);
     }
 
+    @Override
     public void render (Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
     {
         super.render(entity, f, f1, f2, f3, f4, f5);
@@ -273,6 +274,7 @@ public class ModelPullcart extends ModelBase
         model.rotateAngleZ = z;
     }
 
+    @Override
     public void setRotationAngles (float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
     {
         super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);

src/main/java/tconstruct/client/entity/SlimeModel.java

@@ -42,6 +42,7 @@ public class SlimeModel extends ModelBase
     /**
      * Sets the models various rotation angles then renders the model.
      */
+    @Override
     public void render (Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7)
     {
         this.setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity);

src/main/java/tconstruct/client/entity/item/ExplosiveRender.java

@@ -80,6 +80,7 @@ public class ExplosiveRender extends Render
      * Returns the location of an entity's texture. Doesn't seem to be called
      * unless you call Render.bindEntityTexture.
      */
+    @Override
     protected ResourceLocation getEntityTexture (Entity par1Entity)
     {
         return this.func_110808_a((ExplosivePrimed) par1Entity);
@@ -93,6 +94,7 @@ public class ExplosiveRender extends Render
      * void doRender(T entity, double d, double d1, double d2, float f, float
      * f1). But JAD is pre 1.5 so doesn't do that.
      */
+    @Override
     public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
     {
         this.renderPrimedTNT((ExplosivePrimed) par1Entity, par2, par4, par6, par8, par9);

src/main/java/tconstruct/client/entity/projectile/ArrowRender.java

@@ -268,6 +268,7 @@ public class ArrowRender extends Render
         GL11.glPopMatrix();
     }
 
+    @Override
     protected ResourceLocation getEntityTexture (Entity par1Entity)
     {
         return this.func_110796_a((ArrowEntity) par1Entity);
@@ -281,6 +282,7 @@ public class ArrowRender extends Render
      * void doRender(T entity, double d, double d1, double d2, float f, float
      * f1). But JAD is pre 1.5 so doesn't do that.
      */
+    @Override
     public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
     {
         this.doRenderItem((ArrowEntity) par1Entity, par2, par4, par6, par8, par9);

src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java

@@ -91,6 +91,7 @@ public class ArrowRenderCustom extends Render
         this.doRenderItem((ArrowEntity) par1Entity, par2, par4, par6, par8, par9);
     }
 
+    @Override
     protected ResourceLocation getEntityTexture (Entity par1Entity)
     {
         return this.func_110796_a((ArrowEntity) par1Entity);

src/main/java/tconstruct/client/entity/projectile/DaggerRender.java

@@ -546,6 +546,7 @@ public class DaggerRender extends Render
         tessellator.draw();
     }
 
+    @Override
     protected ResourceLocation getEntityTexture (Entity par1Entity)
     {
         return this.func_110796_a((DaggerEntity) par1Entity);
@@ -559,6 +560,7 @@ public class DaggerRender extends Render
      * void doRender(T entity, double d, double d1, double d2, float f, float
      * f1). But JAD is pre 1.5 so doesn't do that.
      */
+    @Override
     public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
     {
         this.doRenderItem((DaggerEntity) par1Entity, par2, par4, par6, par8, par9);

src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java

@@ -98,6 +98,7 @@ public class DaggerRenderCustom extends Render
         this.doRenderItem((DaggerEntity) par1Entity, par2, par4, par6, par8, par9);
     }
 
+    @Override
     protected ResourceLocation getEntityTexture (Entity par1Entity)
     {
         return this.func_110796_a((DaggerEntity) par1Entity);

src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java

@@ -42,6 +42,7 @@ public class LaunchedItemRender extends Render
      * void doRender(T entity, double d, double d1, double d2, float f, float
      * f1). But JAD is pre 1.5 so doesn't do that.
      */
+    @Override
     public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
     {
         IIcon icon = this.field_94151_a.getIconFromDamage(this.field_94150_f);
@@ -74,6 +75,7 @@ public class LaunchedItemRender extends Render
         }
     }
 
+    @Override
     protected ResourceLocation getEntityTexture (Entity par1Entity)
     {
         return TextureMap.locationItemsTexture;

src/main/java/tconstruct/client/entity/projectile/RangedRenderBase.java

@@ -10,6 +10,7 @@ public abstract class RangedRenderBase extends Render
     {
     }
 
+    @Override
     public void doRender (Entity entity, double d, double d1, double d2, float f, float f1)
     {
     }

src/main/java/tconstruct/client/gui/ArmorExtendedGui.java

@@ -31,6 +31,7 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
         stats = holder;
     }
 
+    @Override
     public void initGui ()
     {
         super.initGui();
@@ -51,6 +52,7 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
         TabRegistry.addTabsToList(this.buttonList);
     }
 
+    @Override
     protected void drawGuiContainerForegroundLayer (int par1, int par2)
     {
         // fontRenderer.drawString(StatCollector.translateToLocal("inventory.armorextended"),
@@ -59,6 +61,7 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
         // 17, (ySize - 96) + 2, 0x404040);
     }
 
+    @Override
     public void drawScreen (int par1, int par2, float par3)
     {
         super.drawScreen(par1, par2, par3);
@@ -87,6 +90,7 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
 
     private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/armorextended.png");
 
+    @Override
     protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

src/main/java/tconstruct/client/gui/FrypanGui.java

@@ -20,6 +20,7 @@ public class FrypanGui extends GuiContainer
         logic = frypan;
     }
 
+    @Override
     protected void drawGuiContainerForegroundLayer (int par1, int par2)
     {
         fontRendererObj.drawString(StatCollector.translateToLocal("crafters.Frypan"), 60, 6, 0x404040);
@@ -28,6 +29,7 @@ public class FrypanGui extends GuiContainer
 
     private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/frypan.png");
 
+    @Override
     protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

src/main/java/tconstruct/client/gui/FurnaceGui.java

@@ -28,6 +28,7 @@ public class FurnaceGui extends GuiContainer
      * Draw the foreground layer for the GuiContainer (everything in front of
      * the items)
      */
+    @Override
     protected void drawGuiContainerForegroundLayer (int par1, int par2)
     {
         String s = this.logic.isInvNameLocalized() ? this.logic.getInvName() : I18n.format(this.logic.getInvName());
@@ -39,6 +40,7 @@ public class FurnaceGui extends GuiContainer
      * Draw the background layer for the GuiContainer (everything behind the
      * items)
      */
+    @Override
     protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

src/main/java/tconstruct/client/gui/GuiButtonTool.java

@@ -38,6 +38,7 @@ public class GuiButtonTool extends GuiButton
     /**
      * Draws this button to the screen.
      */
+    @Override
     public void drawButton (Minecraft mc, int mouseX, int mouseY)
     {
         if (this.visible)

src/main/java/tconstruct/client/gui/KnapsackGui.java

@@ -24,6 +24,7 @@ public class KnapsackGui extends GuiContainer
         stats = holder;
     }
 
+    @Override
     public void initGui ()
     {
         super.initGui();
@@ -47,6 +48,7 @@ public class KnapsackGui extends GuiContainer
         // this.buttonList.add(tab);
     }
 
+    @Override
     protected void drawGuiContainerForegroundLayer (int par1, int par2)
     {
         fontRendererObj.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040);
@@ -55,6 +57,7 @@ public class KnapsackGui extends GuiContainer
 
     private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/knapsack.png");
 
+    @Override
     protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

src/main/java/tconstruct/client/gui/NewContainerGui.java

@@ -85,6 +85,7 @@ public abstract class NewContainerGui extends GuiScreen
     /**
      * Adds the buttons (and other controls) to the screen in question.
      */
+    @Override
     public void initGui ()
     {
         super.initGui();
@@ -96,6 +97,7 @@ public abstract class NewContainerGui extends GuiScreen
     /**
      * Draws the screen and all the components in it.
      */
+    @Override
     public void drawScreen (int mouseX, int mouseY, float par3)
     {
         this.drawDefaultBackground();
@@ -230,6 +232,7 @@ public abstract class NewContainerGui extends GuiScreen
         itemRenderer.zLevel = 0.0F;
     }
 
+    @Override
     protected void renderToolTip (ItemStack par1ItemStack, int par2, int par3)
     {
         List list = par1ItemStack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
@@ -254,6 +257,7 @@ public abstract class NewContainerGui extends GuiScreen
      * creative tab to be checked, current mouse x position, current mouse y
      * position.
      */
+    @Override
     protected void drawCreativeTabHoveringText (String par1Str, int par2, int par3)
     {
         this.func_102021_a(Arrays.asList(new String[] { par1Str }), par2, par3);
@@ -485,6 +489,7 @@ public abstract class NewContainerGui extends GuiScreen
     /**
      * Called when the mouse is clicked.
      */
+    @Override
     protected void mouseClicked (int mouseX, int mouseY, int mouseButton)
     {
         super.mouseClicked(mouseX, mouseY, mouseButton);
@@ -636,6 +641,7 @@ public abstract class NewContainerGui extends GuiScreen
      * (mouseX, mouseY, which) which==-1 is mouseMove, which==0 or which==1 is
      * mouseUp
      */
+    @Override
     protected void mouseMovedOrUp (int par1, int par2, int par3)
     {
         Slot slot = this.getSlotAtPosition(par1, par2);
@@ -826,6 +832,7 @@ public abstract class NewContainerGui extends GuiScreen
      * Fired when a key is typed. This is the equivalent of
      * KeyListener.keyTyped(KeyEvent e).
      */
+    @Override
     protected void keyTyped (char par1, int par2)
     {
         if (par2 == 1 || par2 == this.mc.gameSettings.keyBindInventory.getKeyCode())
@@ -873,6 +880,7 @@ public abstract class NewContainerGui extends GuiScreen
      * Called when the screen is unloaded. Used to disable keyboard repeat
      * events
      */
+    @Override
     public void onGuiClosed ()
     {
         if (this.mc.thePlayer != null)
@@ -885,6 +893,7 @@ public abstract class NewContainerGui extends GuiScreen
      * Returns true if this GUI should pause the game when it is displayed in
      * single-player
      */
+    @Override
     public boolean doesGuiPauseGame ()
     {
         return false;
@@ -893,6 +902,7 @@ public abstract class NewContainerGui extends GuiScreen
     /**
      * Called from the main game loop to update the screen.
      */
+    @Override
     public void updateScreen ()
     {
         super.updateScreen();

src/main/java/tconstruct/client/gui/PartCrafterGui.java

@@ -37,6 +37,7 @@ public class PartCrafterGui extends NewContainerGui
         title = "\u00A7n" + (StatCollector.translateToLocal("gui.partcrafter1"));
     }
 
+    @Override
     protected void drawGuiContainerForegroundLayer (int par1, int par2)
     {
         this.fontRendererObj.drawString(StatCollector.translateToLocal("crafters.PartBuilder"), 6, 6, 4210752);
@@ -152,6 +153,7 @@ public class PartCrafterGui extends NewContainerGui
     private static final ResourceLocation minichest = new ResourceLocation("tinker", "textures/gui/patternchestmini.png");
     private static final ResourceLocation description = new ResourceLocation("tinker", "textures/gui/description.png");
 
+    @Override
     protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3)
     {
         // Draw the background

src/main/java/tconstruct/client/gui/PatternChestGui.java

@@ -22,6 +22,7 @@ public class PatternChestGui extends GuiContainer
         ySize = 168;
     }
 
+    @Override
     protected void drawGuiContainerForegroundLayer (int par1, int par2)
     {
         fontRendererObj.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 60, 6, 0x404040);
@@ -30,6 +31,7 @@ public class PatternChestGui extends GuiContainer
 
     private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternchest.png");
 
+    @Override
     protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

src/main/java/tconstruct/client/gui/StencilTableGui.java

@@ -28,6 +28,7 @@ public class StencilTableGui extends GuiContainer
         patternIndex = 0;
     }
 
+    @Override
     public void onGuiClosed ()
     {
         super.onGuiClosed();
@@ -42,6 +43,7 @@ public class StencilTableGui extends GuiContainer
 
     private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternshaper.png");
 
+    @Override
     protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -55,6 +57,7 @@ public class StencilTableGui extends GuiContainer
         }
     }
 
+    @Override
     public void initGui ()
     {
         super.initGui();
@@ -85,6 +88,7 @@ public class StencilTableGui extends GuiContainer
         // }
     }
 
+    @Override
     protected void actionPerformed (GuiButton button)
     {
         ItemStack pattern = logic.getStackInSlot(0);

src/main/java/tconstruct/client/gui/ToolForgeGui.java

@@ -20,6 +20,7 @@ public class ToolForgeGui extends ToolStationGui
         super(inventoryplayer, stationlogic, world, x, y, z);
     }
 
+    @Override
     protected void mouseClicked (int mouseX, int mouseY, int mouseButton)
     {
         super.mouseClicked(mouseX, mouseY, mouseButton);
@@ -33,6 +34,7 @@ public class ToolForgeGui extends ToolStationGui
         }
     }
 
+    @Override
     public void initGui ()
     {
         super.initGui();
@@ -63,6 +65,7 @@ public class ToolForgeGui extends ToolStationGui
         }
     }
 
+    @Override
     protected void actionPerformed (GuiButton button)
     {
         GuiButtonTool b = (GuiButtonTool) button;
@@ -89,6 +92,7 @@ public class ToolForgeGui extends ToolStationGui
         body = StatCollector.translateToLocal("gui.toolforge2");
     }
 
+    @Override
     void setSlotType (int type)
     {
         switch (type)

src/main/java/tconstruct/client/gui/ToolStationGui.java

@@ -57,6 +57,7 @@ public class ToolStationGui extends NewContainerGui
         Keyboard.enableRepeatEvents(true);
     }
 
+    @Override
     protected void mouseClicked (int mouseX, int mouseY, int mouseButton)
     {
         super.mouseClicked(mouseX, mouseY, mouseButton);
@@ -81,6 +82,7 @@ public class ToolStationGui extends NewContainerGui
         body = StatCollector.translateToLocal("gui.toolforge2");
     }
 
+    @Override
     public void initGui ()
     {
         super.initGui();
@@ -102,6 +104,7 @@ public class ToolStationGui extends NewContainerGui
         }
     }
 
+    @Override
     protected void actionPerformed (GuiButton button)
     {
         ((GuiButton) this.buttonList.get(guiType)).enabled = true;
@@ -144,6 +147,7 @@ public class ToolStationGui extends NewContainerGui
         toolSlots.resetSlots(slotX, slotY);
     }
 
+    @Override
     public void updateScreen ()
     {
         super.updateScreen();
@@ -154,6 +158,7 @@ public class ToolStationGui extends NewContainerGui
      * Draw the foreground layer for the GuiContainer (everything in front of
      * the items)
      */
+    @Override
     protected void drawGuiContainerForegroundLayer (int par1, int par2)
     {
         this.fontRendererObj.drawString(StatCollector.translateToLocal(logic.getInvName()), 6, 8, 0x000000);
@@ -428,6 +433,7 @@ public class ToolStationGui extends NewContainerGui
      * Draw the background layer for the GuiContainer (everything behind the
      * items)
      */
+    @Override
     protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3)
     {
         // Draw the background
@@ -464,6 +470,7 @@ public class ToolStationGui extends NewContainerGui
 
     }
 
+    @Override
     protected void keyTyped (char par1, int keyCode)
     {
         if (keyCode == 1 || (!active && keyCode == this.mc.gameSettings.keyBindInventory.getKeyCode()))

src/main/java/tconstruct/client/pages/BlockCastPage.java

@@ -65,6 +65,7 @@ public class BlockCastPage extends BookPage
 
     private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/booksmeltery.png");
 
+    @Override
     public void renderBackgroundLayer (int localWidth, int localHeight)
     {
         manual.getMC().getTextureManager().bindTexture(background);

src/main/java/tconstruct/client/pages/ModifierPage.java

@@ -59,6 +59,7 @@ public class ModifierPage extends BookPage
 
     private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/bookmodify.png");
 
+    @Override
     public void renderBackgroundLayer (int localWidth, int localHeight)
     {
         manual.getMC().getTextureManager().bindTexture(background);

src/main/java/tconstruct/common/BowRecipe.java

@@ -23,6 +23,7 @@ public class BowRecipe extends ToolRecipe
         super(head, handle, accessory, extra, tool);
     }
 
+    @Override
     public boolean validHead (Item input)
     {
         for (Item part : headList)

src/main/java/tconstruct/entity/BlueSlime.java

@@ -77,6 +77,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
         return StatCollector.translateToLocal("entity." + s + ".name");
     }
 
+    @Override
     public IEntityLivingData onSpawnWithEgg (IEntityLivingData par1EntityLivingData)
     {
         Object par1EntityLivingData1 = super.onSpawnWithEgg(par1EntityLivingData);
@@ -128,6 +129,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
         return this.height * 0.3;
     }
 
+    @Override
     public void jump ()
     {
         this.motionY = 0.05 * getSlimeSize() + 0.37;
@@ -161,6 +163,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
         ForgeHooks.onLivingJump(this);
     }
 
+    @Override
     protected void fall (float par1)
     {
     }
@@ -208,6 +211,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
         }
     }
 
+    @Override
     protected void entityInit ()
     {
         super.entityInit();
@@ -249,6 +253,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
     /**
      * (abstract) Protected helper method to write subclass entity data to NBT.
      */
+    @Override
     public void writeEntityToNBT (NBTTagCompound par1NBTTagCompound)
     {
         super.writeEntityToNBT(par1NBTTagCompound);
@@ -258,6 +263,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
     /**
      * (abstract) Protected helper method to read subclass entity data from NBT.
      */
+    @Override
     public void readEntityFromNBT (NBTTagCompound par1NBTTagCompound)
     {
         super.readEntityFromNBT(par1NBTTagCompound);
@@ -276,6 +282,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
     /**
      * Called to update the entity's position/logic.
      */
+    @Override
     public void onUpdate ()
     {
         if (!this.worldObj.isRemote && this.worldObj.difficultySetting == EnumDifficulty.PEACEFUL && this.getSlimeSize() > 0)
@@ -323,6 +330,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
         }
     }
 
+    @Override
     protected void updateEntityActionState ()
     {
         // Minecraft.getMinecraft().getLogAgent().logInfo("Collided with "+entity.getEntityName());
@@ -372,6 +380,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
         }
     }
 
+    @Override
     public boolean handleWaterMovement ()
     {
         return false;
@@ -398,6 +407,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
     /**
      * Will get destroyed next tick.
      */
+    @Override
     public void setDead ()
     {
         int size = this.getSlimeSize();
@@ -415,6 +425,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
         super.setDead();
     }
 
+    @Override
     protected void dropFewItems (boolean par1, int par2)
     {
         int size = this.getSlimeSize();
@@ -470,6 +481,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
     /**
      * Called by a player entity when they collide with an entity
      */
+    @Override
     public void onCollideWithPlayer (EntityPlayer par1EntityPlayer)
     {
         if (this.canDamagePlayer())
@@ -505,6 +517,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
     /**
      * Returns the sound this mob makes when it is hurt.
      */
+    @Override
     protected String getHurtSound ()
     {
         return "mob.slime." + (this.getSlimeSize() > 1 ? "big" : "small");
@@ -513,6 +526,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
     /**
      * Returns the sound this mob makes on death.
      */
+    @Override
     protected String getDeathSound ()
     {
         return "mob.slime." + (this.getSlimeSize() > 1 ? "big" : "small");
@@ -521,6 +535,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
     /**
      * Returns the item ID for the item the mob drops on death.
      */
+    @Override
     protected Item getDropItem ()
     {
         return TRepo.strangeFood;
@@ -529,6 +544,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
     /**
      * Returns the volume for the sounds this mob makes.
      */
+    @Override
     protected float getSoundVolume ()
     {
         return Math.min(0.05F * (float) this.getSlimeSize(), 0.3f);
@@ -538,6 +554,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
      * The speed it takes to move the entityliving's rotationPitch through the
      * faceEntity method. This is only currently use in wolves.
      */
+    @Override
     public int getVerticalFaceSpeed ()
     {
         return 0;

src/main/java/tconstruct/entity/CartEntity.java

@@ -122,11 +122,13 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * returns if this entity triggers Block.onEntityWalking on the blocks they
      * walk on. used for spiders and wolves to prevent them from trampling crops
      */
+    @Override
     protected boolean canTriggerWalking ()
     {
         return false;
     }
 
+    @Override
     protected void entityInit ()
     {
         this.dataWatcher.addObject(16, new Byte((byte) 0));
@@ -140,6 +142,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * blocks. This enables the entity to be pushable on contact, like boats or
      * minecarts.
      */
+    @Override
     public AxisAlignedBB getCollisionBox (Entity par1Entity)
     {
         return par1Entity.boundingBox;
@@ -148,6 +151,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
     /**
      * returns the bounding box for this entity
      */
+    @Override
     public AxisAlignedBB getBoundingBox ()
     {
         return this.boundingBox;
@@ -157,6 +161,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * Returns true if this entity should push and be pushed by other entities
      * when colliding.
      */
+    @Override
     public boolean canBePushed ()
     {
         return canBePushed;
@@ -166,6 +171,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * Returns the Y offset from the entity's position for any entity riding
      * this one.
      */
+    @Override
     public double getMountedYOffset ()
     {
         return (double) this.height * 0.0D - 0.30000001192092896D;
@@ -214,6 +220,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
         }
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     /**
      * Setups the entity to do the hurt animation. Only used by packets in multiplayer.
@@ -229,6 +236,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * Returns true if other Entities should be prevented from moving through
      * this Entity.
      */
+    @Override
     public boolean canBeCollidedWith ()
     {
         return !this.isDead;
@@ -237,6 +245,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
     /**
      * Will get destroyed next tick.
      */
+    @Override
     public void setDead ()
     {
         if (this.field_82345_h)
@@ -286,6 +295,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * Teleports the entity to another dimension. Params: Dimension number to
      * teleport to
      */
+    @Override
     public void travelToDimension (int par1)
     {
         this.field_82345_h = false;
@@ -295,6 +305,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
     /**
      * Called to update the entity's position/logic.
      */
+    @Override
     public void onUpdate ()
     {
         if (this.getRollingAmplitude() > 0)
@@ -703,6 +714,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
         }
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public float getShadowSize ()
     {
@@ -713,6 +725,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * Applies a velocity to each of the entities pushing them away from each
      * other. Args: entity
      */
+    @Override
     public void applyEntityCollision (Entity par1Entity)
     {
         if (!this.worldObj.isRemote)
@@ -809,6 +822,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
     /**
      * Returns the number of slots in the inventory.
      */
+    @Override
     public int getSizeInventory ()
     {
         return (pullcartType == 1 && getClass() == CartEntity.class ? 27 : 0);
@@ -817,6 +831,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
     /**
      * Returns the stack in slot i
      */
+    @Override
     public ItemStack getStackInSlot (int par1)
     {
         return this.cargoItems[par1];
@@ -826,6 +841,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * Removes from an inventory slot (first arg) up to a specified number
      * (second arg) of items and returns them in a new stack.
      */
+    @Override
     public ItemStack decrStackSize (int par1, int par2)
     {
         if (this.cargoItems[par1] != null)
@@ -861,6 +877,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * whatever it returns as an EntityItem - like when you close a workbench
      * GUI.
      */
+    @Override
     public ItemStack getStackInSlotOnClosing (int par1)
     {
         if (this.cargoItems[par1] != null)
@@ -879,6 +896,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * Sets the given item stack to the specified slot in the inventory (can be
      * crafting or armor sections).
      */
+    @Override
     public void setInventorySlotContents (int par1, ItemStack par2ItemStack)
     {
         this.cargoItems[par1] = par2ItemStack;
@@ -901,6 +919,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * Returns the maximum stack size for a inventory slot. Seems to always be
      * 64, possibly will be extended. *Isn't this more of a set than a get?*
      */
+    @Override
     public int getInventoryStackLimit ()
     {
         return 64;
@@ -909,6 +928,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
     /**
      * Called when an the contents of an Inventory change, usually
      */
+    @Override
     public void markDirty ()
     {
     }
@@ -975,6 +995,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
         return true;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     /**
      * Sets the position and rotation. Only difference from the other one is no bounding on the rotation. Args: posX,
@@ -993,6 +1014,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
         this.motionZ = this.velocityZ;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     /**
      * Sets the velocity to the args. Args: x, y, z
@@ -1008,6 +1030,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
      * Do not make give this method the name canInteractWith because it clashes
      * with Container
      */
+    @Override
     public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer)
     {
         return this.isDead ? false : par1EntityPlayer.getDistanceSqToEntity(this) <= 64.0D;

src/main/java/tconstruct/entity/MetalSlime.java

@@ -30,11 +30,13 @@ public class MetalSlime extends BlueSlime
         return (float) Math.min(i * i + 20, 100);
     }
 
+    @Override
     public int getTotalArmorValue ()
     {
         return super.getTotalArmorValue() + 12;
     }
 
+    @Override
     public void setDead ()
     {
         this.isDead = true;
@@ -51,6 +53,7 @@ public class MetalSlime extends BlueSlime
      * for (int l = 0; l < k; ++l) { this.dropItem(j, 1); } } }
      */
 
+    @Override
     protected void updateEntityActionState ()
     {
         this.despawnEntity();