License, readme and stuff

11 files changed, 71 insertions, 74 deletions

diff --git a/ihl/nei_integration/AchesonFurnaceRecipeHandler.java b/ihl/nei_integration/AchesonFurnaceRecipeHandler.java
index 63dc0c8..8571f3a 100644
--- a/ihl/nei_integration/AchesonFurnaceRecipeHandler.java
+++ b/ihl/nei_integration/AchesonFurnaceRecipeHandler.java
@@ -86,7 +86,7 @@ public class AchesonFurnaceRecipeHandler extends MachineRecipeHandler
     @Override

     public List<PositionedStack> getAdditionalIngredients()

     {

-    	List<PositionedStack> ps = new ArrayList();

+    	List<PositionedStack> ps = new ArrayList<PositionedStack>();

     	RecipeInputOreDictionaryList ari = new RecipeInputOreDictionaryList(new String[] {"stickCoal","stickGraphite"});

     	ps.add(new PositionedStack(ari.getInputs(),16-5,41-11));

     	ps.add(new PositionedStack(ari.getInputs(),52-5,41-11));

diff --git a/ihl/nei_integration/ChemicalReactorRecipeHandler.java b/ihl/nei_integration/ChemicalReactorRecipeHandler.java
index 161bdfe..7dd6801 100644
--- a/ihl/nei_integration/ChemicalReactorRecipeHandler.java
+++ b/ihl/nei_integration/ChemicalReactorRecipeHandler.java
@@ -127,14 +127,4 @@ public class ChemicalReactorRecipeHandler extends MachineRecipeHandler
     {

         return ChemicalReactorTileEntity.getRecipes();

     }

-    

-    private int getFrameY(int number)

-    {

-    	return (number % 10) * 24 + 14;

-    }

-    

-    private int getFrameX(int number)

-    {

-    	return (number / 10) * 24 + 176;

-    }

 }

diff --git a/ihl/nei_integration/CrucibleRecipeHandler.java b/ihl/nei_integration/CrucibleRecipeHandler.java
index dc2c012..d91b137 100644
--- a/ihl/nei_integration/CrucibleRecipeHandler.java
+++ b/ihl/nei_integration/CrucibleRecipeHandler.java
@@ -78,7 +78,7 @@ public class CrucibleRecipeHandler extends MachineRecipeHandler
     @Override

     public List<PositionedStack> getAdditionalIngredients()

     {

-    	List<PositionedStack> ps = new ArrayList();

+    	List<PositionedStack> ps = new ArrayList<PositionedStack>();

     	ps.add(new PositionedStack(IHLUtils.getThisModItemStackWithDamage("crucible", 0),61-5,15-11));

     	ps.add(new PositionedStack(IHLUtils.getThisModItemStackWithDamage("crucible", 1),106-5,15-11));

         return ps;

diff --git a/ihl/nei_integration/CryogenicDistillerRecipeHandler.java b/ihl/nei_integration/CryogenicDistillerRecipeHandler.java
index c3bcff3..5b1a637 100644
--- a/ihl/nei_integration/CryogenicDistillerRecipeHandler.java
+++ b/ihl/nei_integration/CryogenicDistillerRecipeHandler.java
@@ -80,7 +80,8 @@ public class CryogenicDistillerRecipeHandler extends MachineRecipeHandler
         return "cryogenicDistiller";

     }

     

-    @Override

+    @SuppressWarnings("unchecked")

+	@Override

     public void drawExtras(int recipeNumber)

     {

     	MachineRecipeHandler.CachedIORecipe recipe = (MachineRecipeHandler.CachedIORecipe) this.arecipes.get(recipeNumber);

diff --git a/ihl/nei_integration/ElectricEvaporatorRecipeHandler.java b/ihl/nei_integration/ElectricEvaporatorRecipeHandler.java
index 1c9cff3..535646f 100644
--- a/ihl/nei_integration/ElectricEvaporatorRecipeHandler.java
+++ b/ihl/nei_integration/ElectricEvaporatorRecipeHandler.java
@@ -4,7 +4,6 @@ import java.awt.Rectangle;
 import java.util.Map;

 

 import ihl.processing.chemistry.ElectricEvaporatorGui;

-import ihl.processing.chemistry.ElectricEvaporatorTileEntity;

 import ihl.processing.chemistry.EvaporatorTileEntity;

 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

diff --git a/ihl/nei_integration/IHLBlockHighlightHandler.java b/ihl/nei_integration/IHLBlockHighlightHandler.java
index c6f8359..4862a9b 100644
--- a/ihl/nei_integration/IHLBlockHighlightHandler.java
+++ b/ihl/nei_integration/IHLBlockHighlightHandler.java
@@ -2,12 +2,7 @@ package ihl.nei_integration;
 
 import codechicken.nei.api.IHighlightHandler;
 import codechicken.nei.api.ItemInfo;
-import codechicken.nei.guihook.GuiContainerManager;
-import net.minecraft.block.BlockRedstoneWire;
-import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
diff --git a/ihl/nei_integration/IHLRecipeHandler.java b/ihl/nei_integration/IHLRecipeHandler.java
index 4c0ada6..a0d7f7f 100644
--- a/ihl/nei_integration/IHLRecipeHandler.java
+++ b/ihl/nei_integration/IHLRecipeHandler.java
@@ -68,11 +68,11 @@ public abstract class IHLRecipeHandler extends TemplateRecipeHandler
     {

         if (outputId.equals(this.getRecipeId()))

         {

-            Iterator i$ = this.getRecipeList().entrySet().iterator();

+            Iterator<Entry<IRecipeInput, RecipeOutput>> i$ = this.getRecipeList().entrySet().iterator();

 

             while (i$.hasNext())

             {

-                Entry entry = (Entry)i$.next();

+                Entry<IRecipeInput, RecipeOutput> entry = i$.next();

                 this.arecipes.add(new IHLRecipeHandler.CachedIORecipe((IRecipeInput)entry.getKey(), (RecipeOutput)entry.getValue()));

             }

         }

@@ -85,16 +85,16 @@ public abstract class IHLRecipeHandler extends TemplateRecipeHandler
     @Override

 	public void loadCraftingRecipes(ItemStack result)

     {

-        Iterator i$ = this.getRecipeList().entrySet().iterator();

+        Iterator<Entry<IRecipeInput, RecipeOutput>> i$ = this.getRecipeList().entrySet().iterator();

 

         while (i$.hasNext())

         {

-            Entry entry = (Entry)i$.next();

-            Iterator i$1 = ((RecipeOutput)entry.getValue()).items.iterator();

+            Entry<IRecipeInput, RecipeOutput> entry = i$.next();

+            Iterator<ItemStack> i$1 = ((RecipeOutput)entry.getValue()).items.iterator();

 

             while (i$1.hasNext())

             {

-                ItemStack output = (ItemStack)i$1.next();

+                ItemStack output = i$1.next();

 

                 if (NEIServerUtils.areStacksSameTypeCrafting(output, result))

                 {

@@ -108,11 +108,11 @@ public abstract class IHLRecipeHandler extends TemplateRecipeHandler
     @Override

 	public void loadUsageRecipes(ItemStack ingredient)

     {

-        Iterator i$ = this.getRecipeList().entrySet().iterator();

+        Iterator<Entry<IRecipeInput, RecipeOutput>> i$ = this.getRecipeList().entrySet().iterator();

 

         while (i$.hasNext())

         {

-            Entry entry = (Entry)i$.next();

+            Entry<IRecipeInput, RecipeOutput> entry = i$.next();

 

             if (((IRecipeInput)entry.getKey()).matches(ingredient))

             {

@@ -148,9 +148,9 @@ public abstract class IHLRecipeHandler extends TemplateRecipeHandler
 

     public class CachedIORecipe extends CachedRecipe

     {

-        private final List<PositionedStack> ingredients = new ArrayList();

+        private final List<PositionedStack> ingredients = new ArrayList<PositionedStack>();

         private final PositionedStack output;

-        private final List<PositionedStack> otherStacks = new ArrayList();

+        private final List<PositionedStack> otherStacks = new ArrayList<PositionedStack>();

 

         @Override

 		public List<PositionedStack> getIngredients()

@@ -211,12 +211,12 @@ public abstract class IHLRecipeHandler extends TemplateRecipeHandler
             }

             else

             {

-                ArrayList items = new ArrayList();

-                Iterator i = input.getInputs().iterator();

+                ArrayList<ItemStack> items = new ArrayList<ItemStack>();

+                Iterator<ItemStack> i = input.getInputs().iterator();

 

                 while (i.hasNext())

                 {

-                    ItemStack item = (ItemStack)i.next();

+                    ItemStack item = i.next();

                     items.add(StackUtil.copyWithSize(item, input.getAmount()));

                 }

 

diff --git a/ihl/nei_integration/IronWorkbenchRecipeHandler.java b/ihl/nei_integration/IronWorkbenchRecipeHandler.java
index 1589f36..980f13a 100644
--- a/ihl/nei_integration/IronWorkbenchRecipeHandler.java
+++ b/ihl/nei_integration/IronWorkbenchRecipeHandler.java
@@ -5,14 +5,11 @@ import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;

 import codechicken.nei.recipe.TemplateRecipeHandler;

 import ic2.api.recipe.IRecipeInput;

-import ic2.core.Ic2Items;

-import ihl.IHLMod;

 import ihl.recipes.IronWorkbenchRecipe;

 import ihl.utils.IHLUtils;

 

 import java.awt.Rectangle;

 import java.util.ArrayList;

-import java.util.Arrays;

 import java.util.Iterator;

 import java.util.List;

 import net.minecraft.client.gui.inventory.GuiContainer;

@@ -78,7 +75,6 @@ public class IronWorkbenchRecipeHandler extends TemplateRecipeHandler
     @Override

 	public void drawBackground(int recipeNumber)

     {

-    	IronWorkbenchRecipeHandler.CachedIORecipe recipe = (CachedIORecipe) this.arecipes.get(recipeNumber);

         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

         GuiDraw.changeTexture(this.getGuiTexture());

         GuiDraw.drawTexturedModalRect(0, 0, 7, 7, 162, 108);

@@ -128,10 +124,10 @@ public class IronWorkbenchRecipeHandler extends TemplateRecipeHandler
         while (i$.hasNext())

         {

         	IronWorkbenchRecipe entry = i$.next();

-            Iterator i$1 = entry.outputs.iterator();

+            Iterator<ItemStack> i$1 = entry.outputs.iterator();

             while (i$1.hasNext())

             {

-                ItemStack output = (ItemStack)i$1.next();

+                ItemStack output = i$1.next();

                 if (NEIServerUtils.areStacksSameTypeCrafting(output, result))

                 {

                     this.arecipes.add(new IronWorkbenchRecipeHandler.CachedIORecipe(entry));

@@ -150,7 +146,7 @@ public class IronWorkbenchRecipeHandler extends TemplateRecipeHandler
         	IronWorkbenchRecipe entry = i$.next();

         	if(entry.workspaceElements!=null && !entry.workspaceElements.isEmpty())

         	{

-        		Iterator i$1 = entry.workspaceElements.iterator();

+        		Iterator<ItemStack> i$1 = entry.workspaceElements.iterator();

             	while (i$1.hasNext())

             	{

             		ItemStack output = (ItemStack)i$1.next();

@@ -193,9 +189,9 @@ public class IronWorkbenchRecipeHandler extends TemplateRecipeHandler
 

     public class CachedIORecipe extends CachedRecipe

     {

-        private final List<PositionedStack> ingredients = new ArrayList();

+        private final List<PositionedStack> ingredients = new ArrayList<PositionedStack>();

         private final PositionedStack output;

-        private final List<PositionedStack> otherStacks = new ArrayList();

+        private final List<PositionedStack> otherStacks = new ArrayList<PositionedStack>();

 

         @Override

 		public List<PositionedStack> getIngredients()

@@ -227,26 +223,26 @@ public class IronWorkbenchRecipeHandler extends TemplateRecipeHandler
             	this.ingredients.add(new PositionedStack(IHLUtils.getThisModItemStack("ironWorkbench"), workspaceItemsPosX, workspaceItemsPosY));

                 if(recipe.workspaceElements!=null && !recipe.workspaceElements.isEmpty())

                 {

-                    Iterator i = recipe.workspaceElements.iterator();

+                    Iterator<ItemStack> i = recipe.workspaceElements.iterator();

                     int index = 1;

                     while (i.hasNext())

                     {

                     	int x = workspaceItemsPosX;

                     	int y = workspaceItemsPosY + index * 18;

-                        ItemStack stack = (ItemStack)i.next();

+                        ItemStack stack = i.next();

                         this.ingredients.add(new PositionedStack(stack, x, y));

                     	index++;

                     }

                 }

                 if(recipe.tools!=null && !recipe.tools.isEmpty())

                 {

-                    Iterator i = recipe.tools.iterator();

+                    Iterator<IRecipeInput> i = recipe.tools.iterator();

                     int index = 0;

                     while (i.hasNext())

                     {

                     	int x = toolsPosX + (index % 2) * 18;

                     	int y = toolsPosY + index / 2 * 18;

-                    	IRecipeInput rInput = (IRecipeInput)i.next();

+                    	IRecipeInput rInput = i.next();

                         this.ingredients.add(new PositionedStack(rInput.getInputs(), x, y));

                     	index++;

                     }

@@ -254,7 +250,7 @@ public class IronWorkbenchRecipeHandler extends TemplateRecipeHandler
                 

                 if(recipe.materials!=null && !recipe.materials.isEmpty())

                 {

-                    Iterator i = recipe.materials.iterator();

+                    Iterator<IRecipeInput> i = recipe.materials.iterator();

                     int index = 0;

                     while (i.hasNext())

                     {

@@ -262,7 +258,7 @@ public class IronWorkbenchRecipeHandler extends TemplateRecipeHandler
                     	int y = materialsPosY + index / 2 * 18;

                     	IRecipeInput rInput = (IRecipeInput)i.next();

                         Iterator<ItemStack> rInputsi = rInput.getInputs().iterator();

-                        List<ItemStack> itemInputs = new ArrayList();

+                        List<ItemStack> itemInputs = new ArrayList<ItemStack>();

                         while(rInputsi.hasNext())

                         {

                         	ItemStack stack = rInputsi.next().copy();

@@ -277,13 +273,13 @@ public class IronWorkbenchRecipeHandler extends TemplateRecipeHandler
                     }

                 }

                 this.output=new PositionedStack(recipe.outputs.get(0), outputPosX, outputPosY);

-                Iterator i = recipe.outputs.iterator();

+                Iterator<ItemStack> i = recipe.outputs.iterator();

                 int index = 0;

                 while (i.hasNext())

                 {

                   	int x = outputPosX + (index % 3) * 18;

                    	int y = outputPosY + index / 3 * 18;

-                    ItemStack stack = (ItemStack)i.next();

+                    ItemStack stack = i.next();

                     if(index>0)

                     {

                         this.otherStacks.add(new PositionedStack(stack, x, y));

diff --git a/ihl/nei_integration/LabElectrolyzerRecipeHandler.java b/ihl/nei_integration/LabElectrolyzerRecipeHandler.java
index c36e27d..6948a31 100644
--- a/ihl/nei_integration/LabElectrolyzerRecipeHandler.java
+++ b/ihl/nei_integration/LabElectrolyzerRecipeHandler.java
@@ -1,7 +1,9 @@
 package ihl.nei_integration;

 

+import java.awt.Rectangle;

 import java.util.Map;

 

+import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect;

 import ihl.processing.chemistry.LabElectrolyzerGui;

 import ihl.processing.chemistry.LabElectrolyzerTileEntity;

 import ihl.recipes.UniversalRecipeInput;

@@ -59,6 +61,14 @@ public class LabElectrolyzerRecipeHandler extends MachineRecipeHandler
     {

         return "ihl:textures/gui/GUILabElectrolyzer.png";

     }

+    

+    @Override

+    public void loadTransferRects()

+    {

+        this.transferRects.add(new RecipeTransferRect(new Rectangle(7-5,32-10, 18, 18), this.getRecipeId(), new Object[0]));

+        this.transferRects.add(new RecipeTransferRect(new Rectangle(86-5,32-10, 37, 18), this.getRecipeId(), new Object[0]));

+    }

+

 

     @Override

 	public String getOverlayIdentifier()

diff --git a/ihl/nei_integration/MachineRecipeHandler.java b/ihl/nei_integration/MachineRecipeHandler.java
index aa5a30b..82b541a 100644
--- a/ihl/nei_integration/MachineRecipeHandler.java
+++ b/ihl/nei_integration/MachineRecipeHandler.java
@@ -61,6 +61,13 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
     {

     	MachineRecipeHandler.CachedIORecipe recipe = (CachedIORecipe) this.arecipes.get(recipeNumber);

         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

+        for(PositionedStack stack:recipe.ingredients)

+        {

+        	if(stack.item.stackSize==0)

+        	{

+            	GuiDraw.fontRenderer.drawStringWithShadow("0.001", stack.relx+3, stack.rely+9, 16777215);

+        	}

+        }

         if(recipe.output instanceof IHLPositionedStack)

         {

         	IHLPositionedStack rOutput = (IHLPositionedStack) recipe.output;

@@ -112,12 +119,12 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
     {

         if (outputId.equals(this.getRecipeId()))

         {

-            Iterator i$ = this.getRecipeList().entrySet().iterator();

+            Iterator<Entry<UniversalRecipeInput, UniversalRecipeOutput>> i$ = this.getRecipeList().entrySet().iterator();

 

             while (i$.hasNext())

             {

-                Entry entry = (Entry)i$.next();

-                this.arecipes.add(new MachineRecipeHandler.CachedIORecipe((UniversalRecipeInput)entry.getKey(), (UniversalRecipeOutput)entry.getValue(),getAdditionalIngredients()));

+            	Entry<UniversalRecipeInput, UniversalRecipeOutput> entry = i$.next();

+                this.arecipes.add(new MachineRecipeHandler.CachedIORecipe(entry.getKey(), entry.getValue(),getAdditionalIngredients()));

             }

         }

         else

@@ -129,7 +136,7 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
     @Override

 	public void loadCraftingRecipes(ItemStack result)

     {

-        Iterator i$ = this.getRecipeList().entrySet().iterator();

+        Iterator<Entry<UniversalRecipeInput, UniversalRecipeOutput>> i$ = this.getRecipeList().entrySet().iterator();

         FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(result);

         if(fluidStack==null && result.getItem() instanceof IFluidContainerItem)

         {

@@ -152,11 +159,11 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
       	{

             while (i$.hasNext())

             {

-                Entry entry = (Entry)i$.next();

-                Iterator i$1 = ((UniversalRecipeOutput)entry.getValue()).getFluidOutputs().iterator();

+            	Entry<UniversalRecipeInput, UniversalRecipeOutput> entry = i$.next();

+                Iterator<FluidStack> i$1 = ((UniversalRecipeOutput)entry.getValue()).getFluidOutputs().iterator();

                 while (i$1.hasNext())

                 {

-                     FluidStack output = (FluidStack)i$1.next();

+                     FluidStack output = i$1.next();

                      if (output!=null && output.getFluid()==fluidStack.getFluid())

                      {

                          this.arecipes.add(new MachineRecipeHandler.CachedIORecipe((UniversalRecipeInput)entry.getKey(), (UniversalRecipeOutput)entry.getValue(),getAdditionalIngredients()));

@@ -169,8 +176,8 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
         {

             while (i$.hasNext())

             {

-                Entry entry = (Entry)i$.next();

-                Iterator<RecipeOutputItemStack> i$1 = ((UniversalRecipeOutput)entry.getValue()).getItemOutputs().iterator();

+                 Entry<UniversalRecipeInput, UniversalRecipeOutput> entry = i$.next();

+                Iterator<RecipeOutputItemStack> i$1 = (entry.getValue()).getItemOutputs().iterator();

 

                 while (i$1.hasNext())

                 {

@@ -178,7 +185,7 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
 

                     if (NEIServerUtils.areStacksSameTypeCrafting(output.itemStack, result) || IHLUtils.isItemsHaveSameOreDictionaryEntry(output.itemStack, result))

                     {

-                        this.arecipes.add(new MachineRecipeHandler.CachedIORecipe((UniversalRecipeInput)entry.getKey(), (UniversalRecipeOutput)entry.getValue(),getAdditionalIngredients()));

+                        this.arecipes.add(new MachineRecipeHandler.CachedIORecipe(entry.getKey(), entry.getValue(),getAdditionalIngredients()));

                         break;

                     }

                 }

@@ -195,7 +202,7 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
     @Override

 	public void loadUsageRecipes(ItemStack ingredient)

     {

-        Iterator i$ = this.getRecipeList().entrySet().iterator();

+        Iterator<Entry<UniversalRecipeInput, UniversalRecipeOutput>> i$ = this.getRecipeList().entrySet().iterator();

         FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(ingredient);

         if(fluidStack==null && ingredient.getItem() instanceof IFluidContainerItem)

         {

@@ -219,10 +226,10 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
     	{

         	while (i$.hasNext())

         	{

-        		Entry entry = (Entry)i$.next();

+        		Entry<UniversalRecipeInput, UniversalRecipeOutput> entry = i$.next();

             	if (((UniversalRecipeInput)entry.getKey()).containFluidStack(fluidStack))

             	{

-            		this.arecipes.add(new MachineRecipeHandler.CachedIORecipe((UniversalRecipeInput)entry.getKey(), (UniversalRecipeOutput)entry.getValue(),getAdditionalIngredients()));

+            		this.arecipes.add(new MachineRecipeHandler.CachedIORecipe(entry.getKey(), entry.getValue(),getAdditionalIngredients()));

             	}

         	}

     	}

@@ -230,10 +237,10 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
         {

         	while (i$.hasNext())

         	{

-        		Entry entry = (Entry)i$.next();

+        		Entry<UniversalRecipeInput, UniversalRecipeOutput> entry = i$.next();

             	if (((UniversalRecipeInput)entry.getKey()).containItemStack(ingredient))

             	{

-            		this.arecipes.add(new MachineRecipeHandler.CachedIORecipe((UniversalRecipeInput)entry.getKey(), (UniversalRecipeOutput)entry.getValue(),getAdditionalIngredients()));

+            		this.arecipes.add(new MachineRecipeHandler.CachedIORecipe(entry.getKey(), entry.getValue(),getAdditionalIngredients()));

             	}

         	}

         }

@@ -266,9 +273,9 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
 

     public class CachedIORecipe extends CachedRecipe

     {

-        private final List<PositionedStack> ingredients = new ArrayList();

+        private final List<PositionedStack> ingredients = new ArrayList<PositionedStack>();

         public PositionedStack output;

-        public final List<PositionedStack> otherStacks = new ArrayList();

+        public final List<PositionedStack> otherStacks = new ArrayList<PositionedStack>();

         public boolean specialConditions=false;

 

         @Override

@@ -307,16 +314,16 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
             else

             {

             	specialConditions=output1.specialConditions;

-                ArrayList<List<ItemStack>> items = new ArrayList();

-                ArrayList<List<ItemStack>> fluidItems = new ArrayList();

+                ArrayList<List<ItemStack>> items = new ArrayList<List<ItemStack>>();

+                ArrayList<List<ItemStack>> fluidItems = new ArrayList<List<ItemStack>>();

                 if(input.getFluidInputs()!=null && !input.getFluidInputs().isEmpty())

                 {

-                    Iterator i = input.getFluidInputs().iterator();

+                    Iterator<?> i = input.getFluidInputs().iterator();

                     while (i.hasNext())

                     {

                     	IRecipeInputFluid fstackRI = (IRecipeInputFluid)i.next();

                     	List<FluidStack> fstackList = fstackRI.getInputs();

-                    	List<ItemStack> fContainers = new ArrayList();

+                    	List<ItemStack> fContainers = new ArrayList<ItemStack>();

                     	for(FluidStack fstack:fstackList)

                     	{

                             ItemStack stack = Ic2Items.FluidCell.copy();

@@ -333,12 +340,12 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
                 

                 if(input.getItemInputs()!=null && !input.getItemInputs().isEmpty())

                 {

-                    Iterator i = input.getItemInputs().iterator();

+                    Iterator<?> i = input.getItemInputs().iterator();

                     while (i.hasNext())

                     {

                         IRecipeInput rInput = (IRecipeInput)i.next();

                         Iterator<ItemStack> rInputsi = rInput.getInputs().iterator();

-                        List<ItemStack> itemInputs = new ArrayList();

+                        List<ItemStack> itemInputs = new ArrayList<ItemStack>();

                         while(rInputsi.hasNext())

                         {

                         	ItemStack stack = rInputsi.next().copy();

@@ -407,7 +414,7 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler
                     	x = MachineRecipeHandler.this.getFluidOutputPosX()[0];

                     	y = MachineRecipeHandler.this.getFluidOutputPosY()[0];

                     }

-                    Iterator i = output1.getFluidOutputs().iterator();

+                    Iterator<?> i = output1.getFluidOutputs().iterator();

                     if(skipOneFluidOutput)

                     {

                     	i.next();

diff --git a/ihl/nei_integration/NEIIHLConfig.java b/ihl/nei_integration/NEIIHLConfig.java
index 7ffc3fb..288ab24 100644
--- a/ihl/nei_integration/NEIIHLConfig.java
+++ b/ihl/nei_integration/NEIIHLConfig.java
@@ -19,7 +19,6 @@ import ihl.processing.metallurgy.MuffleFurnaceGui;
 import ihl.processing.metallurgy.RollingMachineGui;

 import ihl.processing.metallurgy.WireMillGui;

 import ihl.processing.metallurgy.WoodenRollingMachineGui;

-import ihl.utils.IHLUtils;

 import codechicken.nei.api.API;

 import codechicken.nei.api.IConfigureNEI;

 import codechicken.nei.api.ItemInfo;