- Replaced raw types with parameterized types

- Removed unused code (in some cases reducing memory use by removing unused created objects)
Smeagolworms4 · Oct 4, 2013 · f973602 · f973602
1 parent 5ccaa1a
commit f973602
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 79 deletions.
diff --git a/common/rebelkeithy/mods/metallurgy/core/MetallurgyCore.java b/common/rebelkeithy/mods/metallurgy/core/MetallurgyCore.java
@@ -117,11 +117,11 @@ public void preInit(FMLPreInitializationEvent event)
 
         log = event.getModLog();
 
-        for (final MetalSet set : getMetalSetList())
-        {
-            // set.initConfig();
-            // set.init();
-        }
+//        for (final MetalSet set : getMetalSetList())
+//        {
+//            // set.initConfig();
+//            // set.init();
+//        }
 
         initConfig();
 

diff --git a/common/rebelkeithy/mods/metallurgy/core/metalsets/ItemMetallurgySword.java b/common/rebelkeithy/mods/metallurgy/core/metalsets/ItemMetallurgySword.java
@@ -24,6 +24,7 @@ public void addHitListener(ISwordHitListener hl)
         hlList.add(hl);
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
     public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
     {

diff --git a/common/rebelkeithy/mods/metallurgy/core/metalsets/OreInfo.java b/common/rebelkeithy/mods/metallurgy/core/metalsets/OreInfo.java
@@ -275,7 +275,7 @@ public void addRecipes()
         {
             // System.out.println("Adding alloy recipe " + alloyRecipe[0] +
             // " + " + alloyRecipe[1] + " for " + name);
-            GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(dust, 2), alloyRecipe));
+            GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(dust, 2), (Object[])alloyRecipe));
         }
     }
 

diff --git a/common/rebelkeithy/mods/metallurgy/core/metalsets/SortedList.java b/common/rebelkeithy/mods/metallurgy/core/metalsets/SortedList.java
diff --git a/common/rebelkeithy/mods/metallurgy/machines/MetallurgyMachines.java b/common/rebelkeithy/mods/metallurgy/machines/MetallurgyMachines.java
@@ -56,7 +56,6 @@
 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.Mod.PreInit;
 import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;

diff --git a/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java
@@ -1,15 +1,12 @@
 package rebelkeithy.mods.metallurgy.machines.abstractor;
 
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 
+import net.minecraft.item.ItemStack;
+
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Table;
-import com.google.common.collect.Tables;
-
-import net.minecraft.item.ItemStack;
 
 public class AbstractorRecipes
 {
@@ -72,7 +69,7 @@ public void addEssenceAmount(int itemID, int amount)
         smeltingList.put(Integer.valueOf(itemID), amount);
     }
 
-    public Map getEssenceList()
+    public Map<Integer, Integer> getEssenceList()
     {
         return smeltingList;
     }

diff --git a/common/rebelkeithy/mods/metallurgy/machines/abstractor/TileEntityAbstractor.java b/common/rebelkeithy/mods/metallurgy/machines/abstractor/TileEntityAbstractor.java
@@ -3,7 +3,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.List;
 import java.util.Random;
 
 import net.minecraft.entity.item.EntityXPOrb;
@@ -13,7 +12,6 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet250CustomPayload;
-import rebelkeithy.mods.keithyutils.Coord;
 import rebelkeithy.mods.metallurgy.core.MetallurgyCore;
 import rebelkeithy.mods.metallurgy.machines.ConfigMachines;
 import rebelkeithy.mods.metallurgy.machines.TileEntityMachineBase;
@@ -457,7 +455,7 @@ public void smeltItem()
                 furnaceItemStacks[0] = null;
             }
 
-            final List<Coord> coords = Coord.get4AdjacentSides(xCoord, yCoord, zCoord);
+//            final List<Coord> coords = Coord.get4AdjacentSides(xCoord, yCoord, zCoord);
 
 //            for (final Coord coord : coords)
 //            {

diff --git a/common/rebelkeithy/mods/metallurgy/machines/chests/ItemBlockPreciousChest.java b/common/rebelkeithy/mods/metallurgy/machines/chests/ItemBlockPreciousChest.java
@@ -14,6 +14,7 @@ public ItemBlockPreciousChest(int i)
         setHasSubtypes(true);
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
     public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
     {

diff --git a/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java
@@ -1,18 +1,16 @@
 package rebelkeithy.mods.metallurgy.machines.crusher;
 
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Table;
-
-import rebelkeithy.mods.metallurgy.machines.MetallurgyMachines;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
+import rebelkeithy.mods.metallurgy.machines.MetallurgyMachines;
+
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Table;
 
 public class CrusherRecipes
 {

diff --git a/common/rebelkeithy/mods/metallurgy/machines/enchanter/GuiMetallurgyEnchantment.java b/common/rebelkeithy/mods/metallurgy/machines/enchanter/GuiMetallurgyEnchantment.java
@@ -5,7 +5,6 @@
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.model.ModelBook;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -28,8 +27,6 @@ public class GuiMetallurgyEnchantment extends GuiContainer
     private static final ResourceLocation background = new ResourceLocation("metallurgy:textures/guis/enchant.png");
     private static final ResourceLocation book = new ResourceLocation("textures/entity/enchanting_table_book.png");
 
-    /** The book model used on the GUI. */
-    private static ModelBook bookModel = new ModelBook();
     private final Random rand = new Random();
 
     /** ContainerEnchantment object associated with this gui */

diff --git a/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemBlockColoredGlass.java b/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemBlockColoredGlass.java
@@ -22,6 +22,7 @@ public int getMetadata(int i)
         return i;
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
     /**
      * returns a list of items with the same ID, but different meta (eg: dye returns 16 items)

diff --git a/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemGlassDust.java b/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemGlassDust.java
@@ -40,6 +40,7 @@ public int getMetadata(int i)
         return i;
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
     /**
      * returns a list of items with the same ID, but different meta (eg: dye returns 16 items)

diff --git a/common/rebelkeithy/mods/metallurgy/machines/mint/MintRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/mint/MintRecipes.java
@@ -1,12 +1,11 @@
 package rebelkeithy.mods.metallurgy.machines.mint;
 
-import java.util.HashMap;
 import java.util.Map;
 
-import com.google.common.collect.Maps;
-
 import net.minecraft.item.ItemStack;
 
+import com.google.common.collect.Maps;
+
 public class MintRecipes
 {
     private static final MintRecipes smeltingBase = new MintRecipes();

diff --git a/common/rebelkeithy/mods/metallurgy/machines/orbs/ItemOrb.java b/common/rebelkeithy/mods/metallurgy/machines/orbs/ItemOrb.java
@@ -31,6 +31,7 @@ public ItemOrb(int par1)
         setMaxStackSize(1);
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
     public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
     {
@@ -104,6 +105,7 @@ public int getMaxItemUseDuration(ItemStack par1ItemStack)
         return 72000;
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
     @Override
     public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)

diff --git a/common/rebelkeithy/mods/metallurgy/machines/storage/GuiStorage.java b/common/rebelkeithy/mods/metallurgy/machines/storage/GuiStorage.java
@@ -9,7 +9,6 @@
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.gui.inventory.GuiInventory;
 import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 
 import org.lwjgl.input.Keyboard;
@@ -281,7 +280,6 @@ protected void mouseClicked(int par1, int par2, int par3)
         {
             final int var4 = par1 - guiLeft;
             final int var5 = par2 - guiTop;
-            final CreativeTabs[] var6 = CreativeTabs.creativeTabArray;
             if (var5 < 0 && var5 > -32)
             {
                 if (var4 >= 0 && var4 < 29 * Math.min(6, tabList.size()) && var4 % 29 < 28)

diff --git a/common/rebelkeithy/mods/metallurgy/metals/MetallurgyMetals.java b/common/rebelkeithy/mods/metallurgy/metals/MetallurgyMetals.java
@@ -20,7 +20,6 @@
 import rebelkeithy.mods.metallurgy.core.metalsets.ISwordHitListener;
 import rebelkeithy.mods.metallurgy.core.metalsets.ItemMetallurgy;
 import rebelkeithy.mods.metallurgy.core.metalsets.MetalSet;
-import rebelkeithy.mods.metallurgy.integration.AppliedEnergestics;
 import rebelkeithy.mods.metallurgy.integration.ComputerCraftIntegration;
 import rebelkeithy.mods.metallurgy.integration.IndustrialCraftIntegration;
 import rebelkeithy.mods.metallurgy.integration.RailcraftIntegration;
@@ -32,13 +31,10 @@
 import rebelkeithy.mods.metallurgy.metals.utilityItems.tnt.BlockMinersTNT;
 import rebelkeithy.mods.metallurgy.metals.utilityItems.tnt.EntityLargeTNTPrimed;
 import rebelkeithy.mods.metallurgy.metals.utilityItems.tnt.EntityMinersTNTPrimed;
+import cpw.mods.fml.common.IFuelHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Init;
 import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.Mod.PostInit;
-import cpw.mods.fml.common.Mod.PreInit;
-import cpw.mods.fml.common.IFuelHandler;
 import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -105,11 +101,11 @@ private void addRailRecipes()
 
     }
 
-    private void addEnderRecipes()
-    {
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.enderPearl, 4), " E ", "E E", " E ", 'E', "ingotMeutoite"));
-
-    }
+//    private void addEnderRecipes()
+//    {
+//        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.enderPearl, 4), " E ", "E E", " E ", 'E', "ingotMeutoite"));
+//       
+//    }
 
     public void addSwordEffects()
     {

diff --git a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/BlockLargeTNT.java b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/BlockLargeTNT.java
@@ -3,7 +3,6 @@
 import net.minecraft.block.BlockTNT;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.item.Item;

diff --git a/common/rebelkeithy/mods/metallurgy/vanilla/MetallurgyVanilla.java b/common/rebelkeithy/mods/metallurgy/vanilla/MetallurgyVanilla.java
@@ -15,9 +15,6 @@
 import rebelkeithy.mods.metallurgy.core.metalsets.MetalSet;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Init;
-import cpw.mods.fml.common.Mod.PostInit;
-import cpw.mods.fml.common.Mod.PreInit;
 import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;