Removed unnecessary variables and methods

src/main/java/cpw/mods/ironchest/BlockIronChest.java

@@ -17,8 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.google.common.collect.Lists;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -38,6 +36,9 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+
+import com.google.common.collect.Lists;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -45,9 +46,6 @@ public class BlockIronChest extends BlockContainer {
 
     private Random random;
 
-    @SideOnly(Side.CLIENT)
-    private IIcon[][] icons;
-
     public BlockIronChest()
     {
         super(Material.iron);
@@ -58,13 +56,10 @@ public class BlockIronChest extends BlockContainer {
         setCreativeTab(CreativeTabs.tabDecorations);
     }
 
-    /**
-     * Overridden by {@link #createTileEntity(World, int)}
-     */
     @Override
-    public TileEntity createNewTileEntity(World w, int i)
+    public TileEntity createNewTileEntity(World world, int meta)
     {
-        return null;
+    	return IronChestType.makeEntity(meta);
     }
 
     @Override
@@ -86,13 +81,7 @@ public class BlockIronChest extends BlockContainer {
     }
 
     @Override
-    public TileEntity createTileEntity(World world, int metadata)
-    {
-        return IronChestType.makeEntity(metadata);
-    }
-
     @SideOnly(Side.CLIENT)
-    @Override
     public IIcon getIcon(int i, int j)
     {
         if (j < IronChestType.values().length)
@@ -112,6 +101,7 @@ public class BlockIronChest extends BlockContainer {
         items.add(stack);
         return items;
     }
+
     @Override
     public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer player, int i1, float f1, float f2, float f3)
     {
@@ -228,7 +218,6 @@ public class BlockIronChest extends BlockContainer {
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List)
     {
@@ -272,7 +261,6 @@ public class BlockIronChest extends BlockContainer {
         return 0;
     }
 
-
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister par1IconRegister)
@@ -283,11 +271,10 @@ public class BlockIronChest extends BlockContainer {
         }
     }
 
-    private static final ForgeDirection[] validRotationAxes = new ForgeDirection[] { UP, DOWN };
     @Override
     public ForgeDirection[] getValidRotations(World worldObj, int x, int y, int z)
     {
-        return validRotationAxes;
+        return new ForgeDirection[] { UP, DOWN };
     }
 
     @Override

src/main/java/cpw/mods/ironchest/CommonProxy.java

@@ -18,12 +18,10 @@ import cpw.mods.fml.common.network.IGuiHandler;
 public class CommonProxy implements IGuiHandler {
     public void registerRenderInformation()
     {
-
     }
 
     public void registerTileEntitySpecialRenderer(IronChestType typ)
     {
-
     }
 
     @Override

src/main/java/cpw/mods/ironchest/ContainerIronChest.java

@@ -101,8 +101,7 @@ public class ContainerIronChest extends Container {
         {
             for (int playerInvCol = 0; playerInvCol < 9; playerInvCol++)
             {
-                addSlotToContainer(new Slot(playerInventory, playerInvCol + playerInvRow * 9 + 9, leftCol + playerInvCol * 18, ySize - (4 - playerInvRow) * 18
+                addSlotToContainer(new Slot(playerInventory, playerInvCol + playerInvRow * 9 + 9, leftCol + playerInvCol * 18, ySize - (4 - playerInvRow) * 18 - 10));
-                        - 10));
             }
 
         }

src/main/java/cpw/mods/ironchest/IronChest.java

@@ -12,14 +12,15 @@ package cpw.mods.ironchest;
 
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
+
 import org.apache.logging.log4j.Level;
+
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -73,16 +74,7 @@ public class IronChest {
         ChestChangerType.generateRecipes();
         NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
         proxy.registerRenderInformation();
-//        if (OCELOTS_SITONCHESTS)
-//        {
-//            MinecraftForge.EVENT_BUS.register(new OcelotsSitOnChestsHandler());
-//        }
         MinecraftForge.EVENT_BUS.register(this);
     }
 
-    @EventHandler
-    public void modsLoaded(FMLPostInitializationEvent evt)
-    {
-    }
-
 }

src/main/java/cpw/mods/ironchest/IronChestAIOcelotSit.java

@@ -1,22 +0,0 @@
-package cpw.mods.ironchest;
-
-import net.minecraft.entity.ai.EntityAIOcelotSit;
-import net.minecraft.entity.passive.EntityOcelot;
-import net.minecraft.world.World;
-
-public class IronChestAIOcelotSit extends EntityAIOcelotSit {
-    public IronChestAIOcelotSit(EntityOcelot par1EntityOcelot, float par2)
-    {
-        super(par1EntityOcelot, par2);
-    }
-
-/*    @Override
-    protected boolean func_151486_a(World world, int x, int y, int z)
-    {
-        if (world.getBlock(x, y, z) == IronChest.ironChestBlock)
-        {
-            return true;
-        }
-        return super.func_151486_a(world, x, y, z);
-    }
-*/}

src/main/java/cpw/mods/ironchest/MappableItemStackWrapper.java

@@ -1,33 +0,0 @@
-package cpw.mods.ironchest;
-
-import net.minecraft.item.ItemStack;
-
-public class MappableItemStackWrapper {
-    private ItemStack wrap;
-
-    public MappableItemStackWrapper(ItemStack toWrap)
-    {
-        wrap = toWrap;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (!(obj instanceof MappableItemStackWrapper)) return false;
-        MappableItemStackWrapper isw = (MappableItemStackWrapper) obj;
-        if (wrap.getHasSubtypes())
-        {
-            return isw.wrap.isItemEqual(wrap);
-        }
-        else
-        {
-            return isw.wrap == wrap;
-        }
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return System.identityHashCode(wrap);
-    }
-}

src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java

@@ -1,30 +0,0 @@
-package cpw.mods.ironchest;
-
-import java.util.List;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import net.minecraft.entity.ai.EntityAIOcelotSit;
-import net.minecraft.entity.ai.EntityAITasks;
-import net.minecraft.entity.passive.EntityOcelot;
-import net.minecraftforge.event.entity.living.LivingEvent;
-
-public class OcelotsSitOnChestsHandler {
-    @SubscribeEvent
-    public void changeSittingTaskForOcelots(LivingEvent.LivingUpdateEvent evt)
-    {
-        if (evt.entityLiving.ticksExisted < 5 && evt.entityLiving instanceof EntityOcelot)
-        {
-            EntityOcelot ocelot = (EntityOcelot) evt.entityLiving;
-            @SuppressWarnings("unchecked")
-            List<EntityAITasks.EntityAITaskEntry> tasks = ocelot.tasks.taskEntries;
-
-            for (int i = 0; i < tasks.size(); i++)
-            {
-                EntityAITasks.EntityAITaskEntry task = tasks.get(i);
-                if (task.priority == 6 && (task.action instanceof EntityAIOcelotSit) && !(task.action instanceof IronChestAIOcelotSit))
-                {
-                    task.action = new IronChestAIOcelotSit(ocelot, 0.4F);
-                }
-            }
-        }
-    }
-}

src/main/java/cpw/mods/ironchest/PacketHandler.java

@@ -13,7 +13,9 @@ package cpw.mods.ironchest;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
+
 import java.util.EnumMap;
+
 import net.minecraft.network.Packet;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;

src/main/java/cpw/mods/ironchest/TileEntityIronChest.java

@@ -527,6 +527,5 @@ public class TileEntityIronChest extends TileEntity implements IInventory {
 
     public void removeAdornments()
     {
-
     }
 }

src/main/java/cpw/mods/ironchest/Version.java

@@ -9,12 +9,7 @@ package cpw.mods.ironchest;
 import java.util.Properties;
 
 public class Version {
-    private static String major;
+    private static String major, minor, rev, build, mcversion;
-    private static String minor;
-    private static String rev;
-    private static String build;
-    @SuppressWarnings("unused")
-    private static String mcversion;
 
     static void init(Properties properties)
     {

src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java

@@ -18,11 +18,11 @@ import static org.lwjgl.opengl.GL11.glPushMatrix;
 import static org.lwjgl.opengl.GL11.glRotatef;
 import static org.lwjgl.opengl.GL11.glScalef;
 import static org.lwjgl.opengl.GL11.glTranslatef;
-import java.util.HashMap;
+
 import java.util.Map;
 import java.util.Random;
+
 import net.minecraft.client.model.ModelChest;
-import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -30,17 +30,15 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.primitives.SignedBytes;
+
 import cpw.mods.ironchest.IronChestType;
-import cpw.mods.ironchest.MappableItemStackWrapper;
 import cpw.mods.ironchest.TileEntityIronChest;
 
 public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer {
-    @SuppressWarnings("unused")
-    private static Map<MappableItemStackWrapper, Integer> renderList = new HashMap<MappableItemStackWrapper, Integer>();
-
     private static Map<IronChestType, ResourceLocation> locations;
     static {
         Builder<IronChestType, ResourceLocation> builder = ImmutableMap.<IronChestType,ResourceLocation>builder();
@@ -49,11 +47,8 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer {
         }
         locations = builder.build();
     }
+
     private Random random;
-
-    @SuppressWarnings("unused")
-    private RenderBlocks renderBlocks;
-
     private RenderItem itemRenderer;
 
     private static float[][] shifts = { { 0.3F, 0.45F, 0.3F }, { 0.7F, 0.45F, 0.3F }, { 0.3F, 0.45F, 0.7F }, { 0.7F, 0.45F, 0.7F }, { 0.3F, 0.1F, 0.3F },
@@ -63,7 +58,6 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer {
     {
         model = new ModelChest();
         random = new Random();
-        renderBlocks = new RenderBlocks();
         itemRenderer = new RenderItem() {
             @Override
             public byte getMiniBlockCount(ItemStack stack, byte original) {