fixing bugs with Iron workbench and fractionator

22 files changed, 34 insertions, 51 deletions

diff --git a/ihl/nei_integration/AchesonFurnaceRecipeHandler.java b/ihl/nei_integration/AchesonFurnaceRecipeHandler.java
index 959991e..2ffa450 100644
--- a/ihl/nei_integration/AchesonFurnaceRecipeHandler.java
+++ b/ihl/nei_integration/AchesonFurnaceRecipeHandler.java
@@ -8,7 +8,6 @@ import ihl.processing.metallurgy.AchesonFurnanceTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 

 public class AchesonFurnaceRecipeHandler extends MachineRecipeHandler

diff --git a/ihl/nei_integration/CrucibleRecipeHandler.java b/ihl/nei_integration/CrucibleRecipeHandler.java
index acd2849..87bd6a2 100644
--- a/ihl/nei_integration/CrucibleRecipeHandler.java
+++ b/ihl/nei_integration/CrucibleRecipeHandler.java
@@ -10,7 +10,6 @@ import ihl.recipes.UniversalRecipeInput;
 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLUtils;

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

-import net.minecraft.util.StatCollector;

 

 

 public class CrucibleRecipeHandler extends MachineRecipeHandler

diff --git a/ihl/nei_integration/DetonationSprayingMachineRecipeHandler.java b/ihl/nei_integration/DetonationSprayingMachineRecipeHandler.java
index 5280d37..e821bef 100644
--- a/ihl/nei_integration/DetonationSprayingMachineRecipeHandler.java
+++ b/ihl/nei_integration/DetonationSprayingMachineRecipeHandler.java
@@ -9,7 +9,6 @@ import ihl.processing.metallurgy.DetonationSprayingMachineTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 

 public class DetonationSprayingMachineRecipeHandler extends MachineRecipeHandler

diff --git a/ihl/nei_integration/ElectricEvaporatorRecipeHandler.java b/ihl/nei_integration/ElectricEvaporatorRecipeHandler.java
index 6006aa0..349601a 100644
--- a/ihl/nei_integration/ElectricEvaporatorRecipeHandler.java
+++ b/ihl/nei_integration/ElectricEvaporatorRecipeHandler.java
@@ -8,7 +8,6 @@ import ihl.processing.chemistry.EvaporatorTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 

 public class ElectricEvaporatorRecipeHandler extends MachineRecipeHandler

diff --git a/ihl/nei_integration/ElectrolysisBathRecipeHandler.java b/ihl/nei_integration/ElectrolysisBathRecipeHandler.java
index 381c141..bf91f03 100644
--- a/ihl/nei_integration/ElectrolysisBathRecipeHandler.java
+++ b/ihl/nei_integration/ElectrolysisBathRecipeHandler.java
@@ -8,7 +8,6 @@ import ihl.processing.chemistry.ElectrolysisBathTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 

 public class ElectrolysisBathRecipeHandler extends MachineRecipeHandler

diff --git a/ihl/nei_integration/EvaporatorRecipeHandler.java b/ihl/nei_integration/EvaporatorRecipeHandler.java
index 8bf9431..54eb4e9 100644
--- a/ihl/nei_integration/EvaporatorRecipeHandler.java
+++ b/ihl/nei_integration/EvaporatorRecipeHandler.java
@@ -8,7 +8,6 @@ import ihl.processing.chemistry.EvaporatorTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 

 public class EvaporatorRecipeHandler extends MachineRecipeHandler

diff --git a/ihl/nei_integration/ExtruderRecipeHandler.java b/ihl/nei_integration/ExtruderRecipeHandler.java
index c00c471..64dd072 100644
--- a/ihl/nei_integration/ExtruderRecipeHandler.java
+++ b/ihl/nei_integration/ExtruderRecipeHandler.java
@@ -3,13 +3,11 @@ package ihl.nei_integration;
 import java.awt.Rectangle;

 import java.util.Map;

 

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

 import ihl.processing.metallurgy.ExtruderGui;

 import ihl.processing.metallurgy.ExtruderTileEntity;

 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 public class ExtruderRecipeHandler extends MachineRecipeHandler {

 	@Override

diff --git a/ihl/nei_integration/FluidizedBedReactorRecipeHandler.java b/ihl/nei_integration/FluidizedBedReactorRecipeHandler.java
index 00aef05..2f9c581 100644
--- a/ihl/nei_integration/FluidizedBedReactorRecipeHandler.java
+++ b/ihl/nei_integration/FluidizedBedReactorRecipeHandler.java
@@ -9,7 +9,6 @@ import ihl.processing.chemistry.FluidizedBedReactorTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 

 public class FluidizedBedReactorRecipeHandler extends MachineRecipeHandler

diff --git a/ihl/nei_integration/FractionationColumnRecipeHandler.java b/ihl/nei_integration/FractionationColumnRecipeHandler.java
index 399adca..693dce2 100644
--- a/ihl/nei_integration/FractionationColumnRecipeHandler.java
+++ b/ihl/nei_integration/FractionationColumnRecipeHandler.java
@@ -6,7 +6,6 @@ import ihl.processing.chemistry.FractionatorBottomTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 

 public class FractionationColumnRecipeHandler extends MachineRecipeHandler

diff --git a/ihl/nei_integration/GasWeldingStationGasRecipeHandler.java b/ihl/nei_integration/GasWeldingStationGasRecipeHandler.java
index 8d5a0c4..eef6b75 100644
--- a/ihl/nei_integration/GasWeldingStationGasRecipeHandler.java
+++ b/ihl/nei_integration/GasWeldingStationGasRecipeHandler.java
@@ -8,7 +8,6 @@ import ihl.processing.metallurgy.GasWeldingStationTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 

 public class GasWeldingStationGasRecipeHandler extends MachineRecipeHandler

diff --git a/ihl/nei_integration/IHLBlockHighlightHandler.java b/ihl/nei_integration/IHLBlockHighlightHandler.java
index 4862a9b..1fc3666 100644
--- a/ihl/nei_integration/IHLBlockHighlightHandler.java
+++ b/ihl/nei_integration/IHLBlockHighlightHandler.java
@@ -1,16 +1,16 @@
 package ihl.nei_integration;
 
+import java.util.List;
+
 import codechicken.nei.api.IHighlightHandler;
 import codechicken.nei.api.ItemInfo;
+import ihl.flexible_cable.RectifierTransformerUnitTileEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
-import ihl.flexible_cable.RectifierTransformerUnitTileEntity;
-
-import java.util.List;
 
 public class IHLBlockHighlightHandler implements IHighlightHandler
 {
diff --git a/ihl/nei_integration/IHLPositionedStack.java b/ihl/nei_integration/IHLPositionedStack.java
index 5c81ba9..f818b17 100644
--- a/ihl/nei_integration/IHLPositionedStack.java
+++ b/ihl/nei_integration/IHLPositionedStack.java
@@ -1,7 +1,7 @@
 package ihl.nei_integration;

 

-import ihl.recipes.RecipeOutputItemStack;

 import codechicken.nei.PositionedStack;

+import ihl.recipes.RecipeOutputItemStack;

 

 public class IHLPositionedStack extends PositionedStack {

 

diff --git a/ihl/nei_integration/IHLRecipeHandler.java b/ihl/nei_integration/IHLRecipeHandler.java
index a0d7f7f..a263ae8 100644
--- a/ihl/nei_integration/IHLRecipeHandler.java
+++ b/ihl/nei_integration/IHLRecipeHandler.java
@@ -1,5 +1,14 @@
 package ihl.nei_integration;

 

+import java.awt.Rectangle;

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+import java.util.Map.Entry;

+

+import org.lwjgl.opengl.GL11;

+

 import codechicken.lib.gui.GuiDraw;

 import codechicken.nei.NEIServerUtils;

 import codechicken.nei.PositionedStack;

@@ -7,14 +16,7 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import ic2.api.recipe.IRecipeInput;

 import ic2.api.recipe.RecipeOutput;

 import ic2.core.util.StackUtil;

-import java.awt.Rectangle;

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Map.Entry;

 import net.minecraft.item.ItemStack;

-import org.lwjgl.opengl.GL11;

 

 public abstract class IHLRecipeHandler extends TemplateRecipeHandler

 {

diff --git a/ihl/nei_integration/ImpregnatingMachineRecipeHandler.java b/ihl/nei_integration/ImpregnatingMachineRecipeHandler.java
index e749617..9abad4b 100644
--- a/ihl/nei_integration/ImpregnatingMachineRecipeHandler.java
+++ b/ihl/nei_integration/ImpregnatingMachineRecipeHandler.java
@@ -9,7 +9,6 @@ import ihl.processing.metallurgy.ImpregnatingMachineTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 

 public class ImpregnatingMachineRecipeHandler extends MachineRecipeHandler

diff --git a/ihl/nei_integration/InjectionMoldRecipeHandler.java b/ihl/nei_integration/InjectionMoldRecipeHandler.java
index 97d03d2..e125b54 100644
--- a/ihl/nei_integration/InjectionMoldRecipeHandler.java
+++ b/ihl/nei_integration/InjectionMoldRecipeHandler.java
@@ -7,7 +7,6 @@ import ihl.processing.metallurgy.InjectionMoldTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 public class InjectionMoldRecipeHandler extends MachineRecipeHandler {

 	@Override

diff --git a/ihl/nei_integration/IronWorkbenchRecipeHandler.java b/ihl/nei_integration/IronWorkbenchRecipeHandler.java
index f0de0c5..c060bb7 100644
--- a/ihl/nei_integration/IronWorkbenchRecipeHandler.java
+++ b/ihl/nei_integration/IronWorkbenchRecipeHandler.java
@@ -1,26 +1,25 @@
 package ihl.nei_integration;

 

-import codechicken.lib.gui.GuiDraw;

-import codechicken.nei.NEIServerUtils;

-import codechicken.nei.PositionedStack;

-import codechicken.nei.recipe.TemplateRecipeHandler;

-import ic2.api.recipe.IRecipeInput;

-import ihl.recipes.IronWorkbenchRecipe;

-import ihl.utils.IHLUtils;

-

 import java.awt.Rectangle;

 import java.util.ArrayList;

 import java.util.Iterator;

 import java.util.List;

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

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.StatCollector;

 

 import org.lwjgl.opengl.GL11;

 

+import codechicken.lib.gui.GuiDraw;

+import codechicken.nei.NEIServerUtils;

+import codechicken.nei.PositionedStack;

+import codechicken.nei.recipe.TemplateRecipeHandler;

+import ic2.api.recipe.IRecipeInput;

 import ihl.flexible_cable.IronWorkbenchGui;

 import ihl.flexible_cable.IronWorkbenchTileEntity;

 import ihl.interfaces.IWire;

+import ihl.recipes.IronWorkbenchRecipe;

+import ihl.utils.IHLUtils;

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

+import net.minecraft.item.ItemStack;

+import net.minecraft.util.StatCollector;

 

 public class IronWorkbenchRecipeHandler extends TemplateRecipeHandler

 {

diff --git a/ihl/nei_integration/LabElectrolyzerRecipeHandler.java b/ihl/nei_integration/LabElectrolyzerRecipeHandler.java
index ea705f6..a9df742 100644
--- a/ihl/nei_integration/LabElectrolyzerRecipeHandler.java
+++ b/ihl/nei_integration/LabElectrolyzerRecipeHandler.java
@@ -11,7 +11,6 @@ import ihl.processing.chemistry.LabElectrolyzerTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 public class LabElectrolyzerRecipeHandler extends MachineRecipeHandler {

 	@Override

diff --git a/ihl/nei_integration/LeadOvenRecipeHandler.java b/ihl/nei_integration/LeadOvenRecipeHandler.java
index 98861a2..8a7f686 100644
--- a/ihl/nei_integration/LeadOvenRecipeHandler.java
+++ b/ihl/nei_integration/LeadOvenRecipeHandler.java
@@ -8,7 +8,6 @@ import ihl.processing.chemistry.LeadOvenTileEntity;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

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

-import net.minecraft.util.StatCollector;

 

 public class LeadOvenRecipeHandler extends MachineRecipeHandler {

 	@Override

diff --git a/ihl/nei_integration/MachineRecipeHandler.java b/ihl/nei_integration/MachineRecipeHandler.java
index 9373738..f4f9412 100644
--- a/ihl/nei_integration/MachineRecipeHandler.java
+++ b/ihl/nei_integration/MachineRecipeHandler.java
@@ -1,5 +1,13 @@
 package ihl.nei_integration;

 

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+import java.util.Map.Entry;

+

+import org.lwjgl.opengl.GL11;

+

 import codechicken.lib.gui.GuiDraw;

 import codechicken.nei.NEIServerUtils;

 import codechicken.nei.PositionedStack;

@@ -13,13 +21,6 @@ import ihl.recipes.RecipeOutputItemStack;
 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLUtils;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Map.Entry;

-

 import net.minecraft.block.Block;

 import net.minecraft.item.ItemBlock;

 import net.minecraft.item.ItemStack;

@@ -30,8 +31,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.IFluidContainerItem;

 

-import org.lwjgl.opengl.GL11;

-

 public abstract class MachineRecipeHandler extends TemplateRecipeHandler

 {

     protected int ticks;

diff --git a/ihl/nei_integration/NEIIHLConfig.java b/ihl/nei_integration/NEIIHLConfig.java
index 8047b27..c1867a7 100644
--- a/ihl/nei_integration/NEIIHLConfig.java
+++ b/ihl/nei_integration/NEIIHLConfig.java
@@ -1,5 +1,8 @@
 package ihl.nei_integration;

 

+import codechicken.nei.api.API;

+import codechicken.nei.api.IConfigureNEI;

+import codechicken.nei.api.ItemInfo;

 import ihl.IHLModInfo;

 import ihl.processing.chemistry.ChemicalReactorGui;

 import ihl.processing.chemistry.CryogenicDistillerGui;

@@ -19,9 +22,6 @@ import ihl.processing.metallurgy.MuffleFurnaceGui;
 import ihl.processing.metallurgy.RollingMachineGui;

 import ihl.processing.metallurgy.WireMillGui;

 import ihl.processing.metallurgy.WoodenRollingMachineGui;

-import codechicken.nei.api.API;

-import codechicken.nei.api.IConfigureNEI;

-import codechicken.nei.api.ItemInfo;

 

 public class NEIIHLConfig implements IConfigureNEI

 {

diff --git a/ihl/nei_integration/PaperMachineRecipeHandler.java b/ihl/nei_integration/PaperMachineRecipeHandler.java
index 141872b..0a5fc90 100644
--- a/ihl/nei_integration/PaperMachineRecipeHandler.java
+++ b/ihl/nei_integration/PaperMachineRecipeHandler.java
@@ -3,7 +3,6 @@ package ihl.nei_integration;
 import java.awt.Rectangle;

 import java.util.Map;

 

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

 import ihl.processing.chemistry.PaperMachineGui;

 import ihl.processing.chemistry.PaperMachineTileEntity;

 import ihl.recipes.UniversalRecipeInput;

diff --git a/ihl/nei_integration/WireMillRecipeHandler.java b/ihl/nei_integration/WireMillRecipeHandler.java
index 6d4ca5f..aebf85e 100644
--- a/ihl/nei_integration/WireMillRecipeHandler.java
+++ b/ihl/nei_integration/WireMillRecipeHandler.java
@@ -6,7 +6,6 @@ import java.util.Map;
 import org.lwjgl.opengl.GL11;

 

 import codechicken.lib.gui.GuiDraw;

-

 import ihl.processing.metallurgy.WireMillGui;

 import ihl.processing.metallurgy.WireMillTileEntity;

 import ihl.recipes.UniversalRecipeInput;