fixing bugs with Iron workbench and fractionator

75 files changed, 663 insertions, 347 deletions

diff --git a/ihl/processing/chemistry/ApparatusProcessableInvSlot.java b/ihl/processing/chemistry/ApparatusProcessableInvSlot.java
index 84a931b..bfed5c9 100644
--- a/ihl/processing/chemistry/ApparatusProcessableInvSlot.java
+++ b/ihl/processing/chemistry/ApparatusProcessableInvSlot.java
@@ -1,11 +1,11 @@
 package ihl.processing.chemistry;

 

-import ic2.api.recipe.IRecipeInput;

-import ic2.core.block.TileEntityInventory;

-import ic2.core.block.invslot.InvSlot;

 import java.util.ArrayList;

 import java.util.List;

 

+import ic2.api.recipe.IRecipeInput;

+import ic2.core.block.TileEntityInventory;

+import ic2.core.block.invslot.InvSlot;

 import net.minecraft.item.Item;

 import net.minecraft.item.ItemStack;

 

@@ -13,7 +13,7 @@ public class ApparatusProcessableInvSlot extends InvSlot {
 

 	public ApparatusProcessableInvSlot(TileEntityInventory base1, String name1, int oldStartIndex1, Access access1,

 			int count, int stackSizeLimit1) {

-		super(base1, name1, oldStartIndex1, access1, count);

+		super(base1, name1, oldStartIndex1, Access.I, count);

 		this.setStackSizeLimit(stackSizeLimit1);

 	}

 

diff --git a/ihl/processing/chemistry/BatteryItem.java b/ihl/processing/chemistry/BatteryItem.java
index 10cd7cd..b9c5435 100644
--- a/ihl/processing/chemistry/BatteryItem.java
+++ b/ihl/processing/chemistry/BatteryItem.java
@@ -8,7 +8,6 @@ import java.util.Map;
 import cpw.mods.fml.common.registry.GameRegistry;

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

 import ic2.api.item.ElectricItem;

 import ic2.api.item.IElectricItem;

 import ic2.api.item.IItemHudInfo;

diff --git a/ihl/processing/chemistry/ChemicalReactorContainer.java b/ihl/processing/chemistry/ChemicalReactorContainer.java
index a1cc0b4..a426765 100644
--- a/ihl/processing/chemistry/ChemicalReactorContainer.java
+++ b/ihl/processing/chemistry/ChemicalReactorContainer.java
@@ -2,12 +2,9 @@ package ihl.processing.chemistry;
 

 import java.util.List;

 

-import ic2.core.ContainerBase;

 import ic2.core.IC2;

 import ic2.core.slot.SlotInvSlot;

 import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.inventory.ICrafting;

-import net.minecraft.inventory.Slot;

 import net.minecraftforge.fluids.FluidStack;

 

 public class ChemicalReactorContainer extends BasicElectricMotorContainer<ChemicalReactorTileEntity> {

diff --git a/ihl/processing/chemistry/ChemicalReactorGui.java b/ihl/processing/chemistry/ChemicalReactorGui.java
index 029281b..de22f76 100644
--- a/ihl/processing/chemistry/ChemicalReactorGui.java
+++ b/ihl/processing/chemistry/ChemicalReactorGui.java
@@ -1,12 +1,12 @@
 package ihl.processing.chemistry;

 

-import cpw.mods.fml.relauncher.Side;

+import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ihl.utils.IHLRenderUtils;

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

 import net.minecraft.util.ResourceLocation;

-import org.lwjgl.opengl.GL11;

-import ihl.utils.IHLRenderUtils;

 

 @SideOnly(Side.CLIENT)

 public class ChemicalReactorGui extends GuiContainer {

diff --git a/ihl/processing/chemistry/ChemicalReactorTileEntity.java b/ihl/processing/chemistry/ChemicalReactorTileEntity.java
index 2630ed2..a124265 100644
--- a/ihl/processing/chemistry/ChemicalReactorTileEntity.java
+++ b/ihl/processing/chemistry/ChemicalReactorTileEntity.java
@@ -3,26 +3,15 @@ package ihl.processing.chemistry;
 import java.util.Arrays;

 import java.util.List;

 import java.util.Map;

+

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.Fluid;

-import net.minecraftforge.fluids.FluidStack;

-import net.minecraftforge.fluids.FluidTankInfo;

-import net.minecraftforge.fluids.IFluidHandler;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

 import ic2.core.block.invslot.InvSlot;

 import ic2.core.block.invslot.InvSlot.Access;

 import ic2.core.block.invslot.InvSlotConsumableLiquid;

 import ic2.core.block.invslot.InvSlotOutput;

-import ihl.processing.chemistry.ApparatusProcessableInvSlot;

 import ihl.processing.invslots.IHLInvSlotOutput;

 import ihl.processing.invslots.InvSlotConsumableLiquidIHL;

 import ihl.processing.metallurgy.BasicElectricMotorTileEntity;

@@ -31,6 +20,16 @@ import ihl.recipes.UniversalRecipeManager;
 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLFluidTank;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraftforge.common.util.ForgeDirection;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidStack;

+import net.minecraftforge.fluids.FluidTankInfo;

+import net.minecraftforge.fluids.IFluidHandler;

 

 public class ChemicalReactorTileEntity extends BasicElectricMotorTileEntity implements IFluidHandler

 {

@@ -49,7 +48,7 @@ public class ChemicalReactorTileEntity extends BasicElectricMotorTileEntity impl
         this.drainInputSlot = new InvSlotConsumableLiquidIHL(this, "drainInput", -1, InvSlot.Access.I, 1, InvSlot.InvSide.TOP, InvSlotConsumableLiquid.OpType.Drain);

         this.fillInputSlot = new InvSlotConsumableLiquidIHL(this, "fillInput", -1, InvSlot.Access.I, 1, InvSlot.InvSide.BOTTOM, InvSlotConsumableLiquid.OpType.Fill);

 		this.emptyFluidItemsSlot = new InvSlotOutput(this, "fluidCellsOutput", 2, 1);

-		this.input = new ApparatusProcessableInvSlot(this, "input", 3, Access.IO, 2, 64);

+		this.input = new ApparatusProcessableInvSlot(this, "input", 3, Access.I, 2, 64);

 	}

 	

     @Override

diff --git a/ihl/processing/chemistry/CryogenicDistillerContainer.java b/ihl/processing/chemistry/CryogenicDistillerContainer.java
index d04ec4e..988b844 100644
--- a/ihl/processing/chemistry/CryogenicDistillerContainer.java
+++ b/ihl/processing/chemistry/CryogenicDistillerContainer.java
@@ -2,12 +2,9 @@ package ihl.processing.chemistry;
 

 import java.util.List;

 

-import ic2.core.ContainerBase;

 import ic2.core.IC2;

 import ic2.core.slot.SlotInvSlot;

 import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.inventory.ICrafting;

-import net.minecraft.inventory.Slot;

 import net.minecraftforge.fluids.FluidStack;

 

 public class CryogenicDistillerContainer extends BasicElectricMotorContainer<CryogenicDistillerTileEntity> {

diff --git a/ihl/processing/chemistry/CryogenicDistillerTileEntity.java b/ihl/processing/chemistry/CryogenicDistillerTileEntity.java
index 9bd11a3..e197088 100644
--- a/ihl/processing/chemistry/CryogenicDistillerTileEntity.java
+++ b/ihl/processing/chemistry/CryogenicDistillerTileEntity.java
@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;

 import java.util.Map;

 

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.core.ContainerBase;

 import ic2.core.block.invslot.InvSlot;

 import ic2.core.block.invslot.InvSlotConsumableLiquid;

@@ -25,8 +27,6 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.FluidTankInfo;

 import net.minecraftforge.fluids.IFluidHandler;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class CryogenicDistillerTileEntity extends BasicElectricMotorTileEntity implements IFluidHandler {

 

diff --git a/ihl/processing/chemistry/DosingPumpGui.java b/ihl/processing/chemistry/DosingPumpGui.java
index 090bdec..dde4f13 100644
--- a/ihl/processing/chemistry/DosingPumpGui.java
+++ b/ihl/processing/chemistry/DosingPumpGui.java
@@ -1,29 +1,27 @@
 package ihl.processing.chemistry;

 

-import cpw.mods.fml.relauncher.Side;

-

-import cpw.mods.fml.relauncher.SideOnly;

-import ic2.core.IC2;

-import net.minecraft.client.Minecraft;

-import net.minecraft.client.gui.GuiTextField;

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

-import net.minecraft.util.ResourceLocation;

-import net.minecraft.util.StatCollector;

-

 import java.awt.event.KeyEvent;

 

 import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ihl.ClientProxy;

 import ihl.IHLMod;

 import ihl.utils.IHLRenderUtils;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.Minecraft;

+import net.minecraft.client.gui.GuiTextField;

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

+import net.minecraft.util.ResourceLocation;

+import net.minecraft.util.StatCollector;

 

 @SideOnly(Side.CLIENT)

 public class DosingPumpGui extends GuiContainer {

 	private static final ResourceLocation background = new ResourceLocation("ihl", "textures/gui/GUIDosingPump.png");

 	private DosingPumpContainer container;

 	private GuiTextField setpointTextField;

+	private int lastFluidAmountSetpoint = -1;

 	private final static int TANK_HEIGHT = 58;

 

 	public DosingPumpGui(DosingPumpContainer container1) {

@@ -38,6 +36,10 @@ public class DosingPumpGui extends GuiContainer {
 

 	@Override

 	protected void drawGuiContainerForegroundLayer(int par1, int par2) {

+		if(lastFluidAmountSetpoint!= this.container.tileEntity.fluidAmountSetpoint){

+			setpointTextField.setText(Integer.toString(this.container.tileEntity.fluidAmountSetpoint));

+			lastFluidAmountSetpoint= this.container.tileEntity.fluidAmountSetpoint;

+		}

 		int xOffset = (this.width - xSize) / 2;

 		int yOffset = (this.height - ySize) / 2;

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

diff --git a/ihl/processing/chemistry/DosingPumpTileEntity.java b/ihl/processing/chemistry/DosingPumpTileEntity.java
index d676bf9..e1e4996 100644
--- a/ihl/processing/chemistry/DosingPumpTileEntity.java
+++ b/ihl/processing/chemistry/DosingPumpTileEntity.java
@@ -1,9 +1,18 @@
 package ihl.processing.chemistry;

 

 import java.util.List;

+

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

+import ic2.core.ContainerBase;

+import ic2.core.IC2;

+import ic2.core.block.invslot.InvSlot;

+import ic2.core.block.invslot.InvSlotConsumableLiquid;

+import ic2.core.block.invslot.InvSlotOutput;

+import ihl.processing.invslots.InvSlotConsumableLiquidIHL;

+import ihl.processing.metallurgy.BasicElectricMotorTileEntity;

+import ihl.utils.IHLFluidTank;

+import ihl.utils.IHLUtils;

 import net.minecraft.client.gui.GuiScreen;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.ItemStack;

@@ -14,15 +23,6 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.FluidTankInfo;

 import net.minecraftforge.fluids.IFluidHandler;

-import ic2.core.ContainerBase;

-import ic2.core.IC2;

-import ic2.core.block.invslot.InvSlot;

-import ic2.core.block.invslot.InvSlotConsumableLiquid;

-import ic2.core.block.invslot.InvSlotOutput;

-import ihl.processing.invslots.InvSlotConsumableLiquidIHL;

-import ihl.processing.metallurgy.BasicElectricMotorTileEntity;

-import ihl.utils.IHLFluidTank;

-import ihl.utils.IHLUtils;

 

 public class DosingPumpTileEntity extends BasicElectricMotorTileEntity implements IFluidHandler {

 	public final InvSlotConsumableLiquidIHL drainInputSlot;

diff --git a/ihl/processing/chemistry/ElectricEvaporatorGui.java b/ihl/processing/chemistry/ElectricEvaporatorGui.java
index 016335f..4a36631 100644
--- a/ihl/processing/chemistry/ElectricEvaporatorGui.java
+++ b/ihl/processing/chemistry/ElectricEvaporatorGui.java
@@ -1,8 +1,11 @@
 package ihl.processing.chemistry;

 

-import cpw.mods.fml.relauncher.Side;

+import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ic2.core.util.DrawUtil;

+import ic2.core.util.GuiTooltipHelper;

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

 import net.minecraft.client.renderer.texture.TextureMap;

 import net.minecraft.util.IIcon;

@@ -11,10 +14,6 @@ import net.minecraft.util.StatCollector;
 import net.minecraftforge.fluids.Fluid;

 import net.minecraftforge.fluids.FluidStack;

 

-import org.lwjgl.opengl.GL11;

-import ic2.core.util.DrawUtil;

-import ic2.core.util.GuiTooltipHelper;

-

 @SideOnly(Side.CLIENT)

 public class ElectricEvaporatorGui extends GuiContainer {

 	private static final ResourceLocation background = new ResourceLocation("ihl", "textures/gui/GUIElectricEvaporator.png");

diff --git a/ihl/processing/chemistry/ElectricEvaporatorTileEntity.java b/ihl/processing/chemistry/ElectricEvaporatorTileEntity.java
index 1b5b647..cdf3524 100644
--- a/ihl/processing/chemistry/ElectricEvaporatorTileEntity.java
+++ b/ihl/processing/chemistry/ElectricEvaporatorTileEntity.java
@@ -6,15 +6,6 @@ import java.util.Set;
 

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.item.EntityItem;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraftforge.common.MinecraftForge;

-import net.minecraftforge.common.util.ForgeDirection;

 import ic2.api.energy.event.EnergyTileLoadEvent;

 import ic2.api.energy.event.EnergyTileUnloadEvent;

 import ic2.api.energy.tile.IEnergySink;

@@ -25,14 +16,22 @@ import ic2.core.IC2;
 import ic2.core.IHasGui;

 import ic2.core.audio.AudioSource;

 import ic2.core.block.invslot.InvSlot;

-import ic2.core.block.invslot.InvSlotUpgrade;

 import ic2.core.block.invslot.InvSlot.Access;

+import ic2.core.block.invslot.InvSlotUpgrade;

 import ic2.core.upgrade.IUpgradableBlock;

 import ic2.core.upgrade.IUpgradeItem;

 import ic2.core.upgrade.UpgradableProperty;

 import ihl.IHLMod;

 import ihl.utils.IHLInvSlotDischarge;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.item.EntityItem;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraftforge.common.MinecraftForge;

+import net.minecraftforge.common.util.ForgeDirection;

 

 public class ElectricEvaporatorTileEntity extends EvaporatorTileEntity implements IEnergySink, IUpgradableBlock, INetworkTileEntityEventListener

 {

diff --git a/ihl/processing/chemistry/ElectrolysisBathGui.java b/ihl/processing/chemistry/ElectrolysisBathGui.java
index 89b8ddb..404ef94 100644
--- a/ihl/processing/chemistry/ElectrolysisBathGui.java
+++ b/ihl/processing/chemistry/ElectrolysisBathGui.java
@@ -1,16 +1,15 @@
 package ihl.processing.chemistry;

 

-import cpw.mods.fml.relauncher.Side;

+import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

 import ic2.core.IC2;

+import ihl.utils.GuiMultiTextureButton;

+import ihl.utils.IHLRenderUtils;

 import net.minecraft.client.gui.GuiButton;

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

 import net.minecraft.util.ResourceLocation;

-import org.lwjgl.opengl.GL11;

-

-import ihl.utils.GuiMultiTextureButton;

-import ihl.utils.IHLRenderUtils;

 

 @SideOnly(Side.CLIENT)

 public class ElectrolysisBathGui extends GuiContainer {

diff --git a/ihl/processing/chemistry/ElectrolysisBathTileEntity.java b/ihl/processing/chemistry/ElectrolysisBathTileEntity.java
index f8fae63..8a498b6 100644
--- a/ihl/processing/chemistry/ElectrolysisBathTileEntity.java
+++ b/ihl/processing/chemistry/ElectrolysisBathTileEntity.java
@@ -6,16 +6,6 @@ import java.util.Map;
 

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.Fluid;

-import net.minecraftforge.fluids.FluidStack;

-import net.minecraftforge.fluids.FluidTankInfo;

-import net.minecraftforge.fluids.IFluidHandler;

 import ic2.api.network.INetworkClientTileEntityEventListener;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

@@ -25,13 +15,22 @@ import ic2.core.block.invslot.InvSlot.Access;
 import ic2.core.block.invslot.InvSlotConsumableLiquid;

 import ic2.core.block.invslot.InvSlotOutput;

 import ihl.flexible_cable.FlexibleCableHolderBaseTileEntity;

-import ihl.processing.chemistry.ApparatusProcessableInvSlot;

 import ihl.processing.invslots.InvSlotConsumableLiquidIHL;

 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeManager;

 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLFluidTank;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraftforge.common.util.ForgeDirection;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidStack;

+import net.minecraftforge.fluids.FluidTankInfo;

+import net.minecraftforge.fluids.IFluidHandler;

 

 public class ElectrolysisBathTileEntity extends FlexibleCableHolderBaseTileEntity implements IHasGui, INetworkClientTileEntityEventListener, IFluidHandler

 {

diff --git a/ihl/processing/chemistry/EvaporatorGui.java b/ihl/processing/chemistry/EvaporatorGui.java
index 12edba9..05f7c31 100644
--- a/ihl/processing/chemistry/EvaporatorGui.java
+++ b/ihl/processing/chemistry/EvaporatorGui.java
@@ -1,8 +1,11 @@
 package ihl.processing.chemistry;

 

-import cpw.mods.fml.relauncher.Side;

+import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ic2.core.util.DrawUtil;

+import ic2.core.util.GuiTooltipHelper;

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

 import net.minecraft.client.renderer.texture.TextureMap;

 import net.minecraft.util.IIcon;

@@ -11,10 +14,6 @@ import net.minecraft.util.StatCollector;
 import net.minecraftforge.fluids.Fluid;

 import net.minecraftforge.fluids.FluidStack;

 

-import org.lwjgl.opengl.GL11;

-import ic2.core.util.DrawUtil;

-import ic2.core.util.GuiTooltipHelper;

-

 @SideOnly(Side.CLIENT)

 public class EvaporatorGui extends GuiContainer {

 	private static final ResourceLocation background = new ResourceLocation("ihl", "textures/gui/GUISolidFuelEvaporator.png");

diff --git a/ihl/processing/chemistry/EvaporatorTileEntity.java b/ihl/processing/chemistry/EvaporatorTileEntity.java
index dbdf2e1..279fa17 100644
--- a/ihl/processing/chemistry/EvaporatorTileEntity.java
+++ b/ihl/processing/chemistry/EvaporatorTileEntity.java
@@ -5,16 +5,6 @@ import java.util.Map;
 

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.item.EntityItem;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.Fluid;

-import net.minecraftforge.fluids.FluidRegistry;

-import net.minecraftforge.fluids.FluidStack;

 import ic2.api.item.IC2Items;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

@@ -31,6 +21,15 @@ import ihl.recipes.UniversalRecipeInput;
 import ihl.recipes.UniversalRecipeManager;

 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.item.EntityItem;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraftforge.common.util.ForgeDirection;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidRegistry;

+import net.minecraftforge.fluids.FluidStack;

 

 public class EvaporatorTileEntity extends TileEntityLiquidTankInventory implements IHasGui

 {

@@ -142,7 +141,7 @@ public class EvaporatorTileEntity extends TileEntityLiquidTankInventory implemen
         {

        		IHLUtils.handleFluidSlotsBehaviour(fillItemsSlot, fluidItemsSlot, emptyFluidItemsSlot, fluidTank);

         }

-        if (this.fuel <= 0 && this.canOperate())

+        if (this.fuel <= 0 && this.canOperate() && this.fuelSlot instanceof InvSlotConsumableFuel)

         {

             this.fuel = this.maxFuel = ((InvSlotConsumableFuel) this.fuelSlot).consumeFuel();

         }

diff --git a/ihl/processing/chemistry/ExtruderModel.java b/ihl/processing/chemistry/ExtruderModel.java
index 25e1263..4d4688a 100644
--- a/ihl/processing/chemistry/ExtruderModel.java
+++ b/ihl/processing/chemistry/ExtruderModel.java
@@ -1,8 +1,8 @@
 package ihl.processing.chemistry;
 
+import ihl.model.IHLModelRenderer;
 import net.minecraft.client.model.ModelBase;
 import net.minecraftforge.common.util.ForgeDirection;
-import ihl.model.IHLModelRenderer;
 
 public class ExtruderModel extends ModelBase
 {
diff --git a/ihl/processing/chemistry/FluidizedBedReactorContainer.java b/ihl/processing/chemistry/FluidizedBedReactorContainer.java
index f8ea002..8b7aa47 100644
--- a/ihl/processing/chemistry/FluidizedBedReactorContainer.java
+++ b/ihl/processing/chemistry/FluidizedBedReactorContainer.java
@@ -2,12 +2,9 @@ package ihl.processing.chemistry;
 

 import java.util.List;

 

-import ic2.core.ContainerBase;

 import ic2.core.IC2;

 import ic2.core.slot.SlotInvSlot;

 import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.inventory.ICrafting;

-import net.minecraft.inventory.Slot;

 import net.minecraftforge.fluids.FluidStack;

 

 public class FluidizedBedReactorContainer extends BasicElectricMotorContainer<FluidizedBedReactorTileEntity> {

diff --git a/ihl/processing/chemistry/FluidizedBedReactorGui.java b/ihl/processing/chemistry/FluidizedBedReactorGui.java
index d79a09d..95ba8f0 100644
--- a/ihl/processing/chemistry/FluidizedBedReactorGui.java
+++ b/ihl/processing/chemistry/FluidizedBedReactorGui.java
@@ -1,12 +1,12 @@
 package ihl.processing.chemistry;

 

-import cpw.mods.fml.relauncher.Side;

+import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ihl.utils.IHLRenderUtils;

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

 import net.minecraft.util.ResourceLocation;

-import org.lwjgl.opengl.GL11;

-import ihl.utils.IHLRenderUtils;

 

 @SideOnly(Side.CLIENT)

 public class FluidizedBedReactorGui extends GuiContainer {

diff --git a/ihl/processing/chemistry/FluidizedBedReactorTileEntity.java b/ihl/processing/chemistry/FluidizedBedReactorTileEntity.java
index bb6cf1e..4961fc6 100644
--- a/ihl/processing/chemistry/FluidizedBedReactorTileEntity.java
+++ b/ihl/processing/chemistry/FluidizedBedReactorTileEntity.java
@@ -3,25 +3,14 @@ package ihl.processing.chemistry;
 import java.util.Arrays;

 import java.util.List;

 import java.util.Map;

+

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.Fluid;

-import net.minecraftforge.fluids.FluidStack;

-import net.minecraftforge.fluids.FluidTankInfo;

-import net.minecraftforge.fluids.IFluidHandler;

 import ic2.core.ContainerBase;

 import ic2.core.block.invslot.InvSlot;

 import ic2.core.block.invslot.InvSlot.Access;

 import ic2.core.block.invslot.InvSlotConsumableLiquid;

 import ic2.core.block.invslot.InvSlotOutput;

-import ihl.processing.chemistry.ApparatusProcessableInvSlot;

 import ihl.processing.invslots.IHLInvSlotOutput;

 import ihl.processing.invslots.InvSlotConsumableLiquidIHL;

 import ihl.processing.metallurgy.BasicElectricMotorTileEntity;

@@ -31,6 +20,16 @@ import ihl.recipes.UniversalRecipeManager;
 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLFluidTank;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraftforge.common.util.ForgeDirection;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidStack;

+import net.minecraftforge.fluids.FluidTankInfo;

+import net.minecraftforge.fluids.IFluidHandler;

 

 public class FluidizedBedReactorTileEntity extends BasicElectricMotorTileEntity implements IFluidHandler

 {

diff --git a/ihl/processing/chemistry/FractionatorBottomTileEntity.java b/ihl/processing/chemistry/FractionatorBottomTileEntity.java
index 2f3b43f..288924e 100644
--- a/ihl/processing/chemistry/FractionatorBottomTileEntity.java
+++ b/ihl/processing/chemistry/FractionatorBottomTileEntity.java
@@ -6,14 +6,6 @@ import java.util.Iterator;
 import java.util.List;

 import java.util.Map;

 

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.FluidStack;

-import net.minecraftforge.fluids.FluidTankInfo;

-import net.minecraftforge.fluids.IFluidHandler;

 import ic2.api.energy.tile.IHeatSource;

 import ic2.core.IC2;

 import ic2.core.block.TileEntityInventory;

@@ -24,8 +16,17 @@ import ihl.recipes.UniversalRecipeOutput;
 import ihl.utils.IHLFluidTank;

 import ihl.utils.IHLUtils;

 import ihl.worldgen.ores.IHLFluid;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraftforge.common.util.ForgeDirection;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidStack;

+import net.minecraftforge.fluids.FluidTankInfo;

+import net.minecraftforge.fluids.IFluidHandler;

 

-public class FractionatorBottomTileEntity extends TileEntityInventory

+public class FractionatorBottomTileEntity extends TileEntityInventory implements IFluidHandler

 {

 	private final static UniversalRecipeManager recipeManager = new UniversalRecipeManager("fractionator");

     private static float kF = 24000F;

@@ -385,4 +386,24 @@ public class FractionatorBottomTileEntity extends TileEntityInventory
     {

         return pass==0;

     }

+

+	@Override

+	public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {

+		return this.fluidTank.drain(resource, doDrain);

+	}

+

+	@Override

+	public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {

+		return this.fluidTank.drain(maxDrain, doDrain);

+	}

+

+	@Override

+	public boolean canFill(ForgeDirection from, Fluid fluid) {

+		return true;

+	}

+

+	@Override

+	public boolean canDrain(ForgeDirection from, Fluid fluid) {

+		return true;

+	}

 }
\ No newline at end of file
diff --git a/ihl/processing/chemistry/FractionatorSectionTileEntity.java b/ihl/processing/chemistry/FractionatorSectionTileEntity.java
index ddd3f31..e71c453 100644
--- a/ihl/processing/chemistry/FractionatorSectionTileEntity.java
+++ b/ihl/processing/chemistry/FractionatorSectionTileEntity.java
@@ -139,7 +139,10 @@ public class FractionatorSectionTileEntity extends TileEntity implements IWrench
 	@Override

 	public FluidTankInfo[] getTankInfo(ForgeDirection arg0) 

 	{

-		return columnBottom.getTankInfo(arg0);

+		if(columnBottom!=null)

+			return columnBottom.getTankInfo(arg0);

+		else

+			return new FluidTankInfo[] {new FluidTankInfo(null, 8000)};

 	}

 

 }

diff --git a/ihl/processing/chemistry/GaedesMercuryRotaryPumpTileEntity.java b/ihl/processing/chemistry/GaedesMercuryRotaryPumpTileEntity.java
index 3227ab7..186b606 100644
--- a/ihl/processing/chemistry/GaedesMercuryRotaryPumpTileEntity.java
+++ b/ihl/processing/chemistry/GaedesMercuryRotaryPumpTileEntity.java
@@ -2,15 +2,15 @@ package ihl.processing.chemistry;
 

 import java.util.List;

 

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

 import ic2.core.ContainerBase;

 import ihl.interfaces.IWorkspaceElement;

 import ihl.processing.metallurgy.BasicElectricMotorTileEntity;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

 

 public class GaedesMercuryRotaryPumpTileEntity extends	BasicElectricMotorTileEntity implements IWorkspaceElement{

 

diff --git a/ihl/processing/chemistry/LabElectrolyzerGui.java b/ihl/processing/chemistry/LabElectrolyzerGui.java
index 8690257..3eb14a3 100644
--- a/ihl/processing/chemistry/LabElectrolyzerGui.java
+++ b/ihl/processing/chemistry/LabElectrolyzerGui.java
@@ -1,12 +1,12 @@
 package ihl.processing.chemistry;

 

-import cpw.mods.fml.relauncher.Side;

+import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ihl.utils.IHLRenderUtils;

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

 import net.minecraft.util.ResourceLocation;

-import org.lwjgl.opengl.GL11;

-import ihl.utils.IHLRenderUtils;

 

 @SideOnly(Side.CLIENT)

 public class LabElectrolyzerGui extends GuiContainer {

diff --git a/ihl/processing/chemistry/LabElectrolyzerTileEntity.java b/ihl/processing/chemistry/LabElectrolyzerTileEntity.java
index 11647d6..19348b6 100644
--- a/ihl/processing/chemistry/LabElectrolyzerTileEntity.java
+++ b/ihl/processing/chemistry/LabElectrolyzerTileEntity.java
@@ -3,18 +3,9 @@ package ihl.processing.chemistry;
 import java.util.Arrays;

 import java.util.List;

 import java.util.Map;

+

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.Fluid;

-import net.minecraftforge.fluids.FluidStack;

-import net.minecraftforge.fluids.FluidTankInfo;

-import net.minecraftforge.fluids.IFluidHandler;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

 import ic2.core.block.invslot.InvSlot;

@@ -28,6 +19,15 @@ import ihl.recipes.UniversalRecipeManager;
 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLFluidTank;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraftforge.common.util.ForgeDirection;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidStack;

+import net.minecraftforge.fluids.FluidTankInfo;

+import net.minecraftforge.fluids.IFluidHandler;

 

 public class LabElectrolyzerTileEntity extends BasicElectricMotorTileEntity implements IFluidHandler {

 	private final static UniversalRecipeManager recipeManager = new UniversalRecipeManager("labelectrolyzer");

diff --git a/ihl/processing/chemistry/LeadOvenGui.java b/ihl/processing/chemistry/LeadOvenGui.java
index 0c35a21..72fb107 100644
--- a/ihl/processing/chemistry/LeadOvenGui.java
+++ b/ihl/processing/chemistry/LeadOvenGui.java
@@ -1,12 +1,12 @@
 package ihl.processing.chemistry;

 

-import cpw.mods.fml.relauncher.Side;

+import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

 import ihl.utils.IHLRenderUtils;

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

 import net.minecraft.util.ResourceLocation;

-import org.lwjgl.opengl.GL11;

 

 @SideOnly(Side.CLIENT)

 public class LeadOvenGui extends GuiContainer {

diff --git a/ihl/processing/chemistry/LeadOvenTileEntity.java b/ihl/processing/chemistry/LeadOvenTileEntity.java
index c2067d8..95636ad 100644
--- a/ihl/processing/chemistry/LeadOvenTileEntity.java
+++ b/ihl/processing/chemistry/LeadOvenTileEntity.java
@@ -6,26 +6,16 @@ import java.util.Map;
 

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.Fluid;

-import net.minecraftforge.fluids.FluidStack;

-import net.minecraftforge.fluids.FluidTankInfo;

-import net.minecraftforge.fluids.IFluidHandler;

 import ic2.api.recipe.IRecipeInput;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

 import ic2.core.IHasGui;

 import ic2.core.block.TileEntityInventory;

 import ic2.core.block.invslot.InvSlot;

+import ic2.core.block.invslot.InvSlot.Access;

 import ic2.core.block.invslot.InvSlotConsumableFuel;

 import ic2.core.block.invslot.InvSlotConsumableLiquid;

 import ic2.core.block.invslot.InvSlotOutput;

-import ic2.core.block.invslot.InvSlot.Access;

 import ihl.processing.invslots.IHLInvSlotOutput;

 import ihl.processing.invslots.InvSlotConsumableLiquidIHL;

 import ihl.recipes.RecipeOutputItemStack;

@@ -34,6 +24,15 @@ import ihl.recipes.UniversalRecipeManager;
 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLFluidTank;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraftforge.common.util.ForgeDirection;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidStack;

+import net.minecraftforge.fluids.FluidTankInfo;

+import net.minecraftforge.fluids.IFluidHandler;

 

 public class LeadOvenTileEntity extends TileEntityInventory implements IHasGui, IFluidHandler {

 	public final InvSlotConsumableFuel fuelSlot;

diff --git a/ihl/processing/chemistry/LoomModel.java b/ihl/processing/chemistry/LoomModel.java
index afef73d..31c2724 100644
--- a/ihl/processing/chemistry/LoomModel.java
+++ b/ihl/processing/chemistry/LoomModel.java
@@ -1,8 +1,8 @@
 package ihl.processing.chemistry;
 
+import ihl.model.IHLModelRenderer;
 import net.minecraft.client.model.ModelBase;
 import net.minecraftforge.common.util.ForgeDirection;
-import ihl.model.IHLModelRenderer;
 
 public class LoomModel extends ModelBase
 {
diff --git a/ihl/processing/chemistry/LoomTileEntity.java b/ihl/processing/chemistry/LoomTileEntity.java
index 4ff9bc4..8432a2d 100644
--- a/ihl/processing/chemistry/LoomTileEntity.java
+++ b/ihl/processing/chemistry/LoomTileEntity.java
@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;

 import java.util.Map;

 

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.api.network.INetworkClientTileEntityEventListener;

 import ic2.api.recipe.IRecipeInput;

 import ic2.core.ContainerBase;

@@ -11,7 +13,6 @@ import ic2.core.IC2;
 import ic2.core.IHasGui;

 import ic2.core.block.TileEntityInventory;

 import ic2.core.block.invslot.InvSlot.Access;

-import ihl.processing.chemistry.ApparatusProcessableInvSlot;

 import ihl.processing.invslots.IHLInvSlotOutput;

 import ihl.recipes.RecipeInputWire;

 import ihl.recipes.UniversalRecipeInput;

@@ -21,8 +22,6 @@ import ihl.utils.IHLUtils;
 import net.minecraft.client.gui.GuiScreen;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.ItemStack;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class LoomTileEntity extends TileEntityInventory implements IHasGui, INetworkClientTileEntityEventListener

 {     

diff --git a/ihl/processing/chemistry/PaperMachineContainer.java b/ihl/processing/chemistry/PaperMachineContainer.java
index 0969649..01db6fd 100644
--- a/ihl/processing/chemistry/PaperMachineContainer.java
+++ b/ihl/processing/chemistry/PaperMachineContainer.java
@@ -2,12 +2,9 @@ package ihl.processing.chemistry;
 

 import java.util.List;

 

-import ic2.core.ContainerBase;

 import ic2.core.IC2;

 import ic2.core.slot.SlotInvSlot;

 import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.inventory.ICrafting;

-import net.minecraft.inventory.Slot;

 import net.minecraftforge.fluids.FluidStack;

 

 public class PaperMachineContainer extends BasicElectricMotorContainer<PaperMachineTileEntity> {

diff --git a/ihl/processing/chemistry/PaperMachineGui.java b/ihl/processing/chemistry/PaperMachineGui.java
index b65f041..8fea247 100644
--- a/ihl/processing/chemistry/PaperMachineGui.java
+++ b/ihl/processing/chemistry/PaperMachineGui.java
@@ -1,12 +1,12 @@
 package ihl.processing.chemistry;

 

-import cpw.mods.fml.relauncher.Side;

+import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ihl.utils.IHLRenderUtils;

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

 import net.minecraft.util.ResourceLocation;

-import org.lwjgl.opengl.GL11;

-import ihl.utils.IHLRenderUtils;

 

 @SideOnly(Side.CLIENT)

 public class PaperMachineGui extends GuiContainer {

diff --git a/ihl/processing/chemistry/PaperMachineTileEntity.java b/ihl/processing/chemistry/PaperMachineTileEntity.java
index eb28314..dddd306 100644
--- a/ihl/processing/chemistry/PaperMachineTileEntity.java
+++ b/ihl/processing/chemistry/PaperMachineTileEntity.java
@@ -3,19 +3,9 @@ package ihl.processing.chemistry;
 import java.util.Arrays;

 import java.util.List;

 import java.util.Map;

+

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.Fluid;

-import net.minecraftforge.fluids.FluidStack;

-import net.minecraftforge.fluids.FluidTankInfo;

-import net.minecraftforge.fluids.IFluidHandler;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

 import ic2.core.block.invslot.InvSlot;

@@ -29,6 +19,16 @@ import ihl.recipes.UniversalRecipeManager;
 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLFluidTank;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraftforge.common.util.ForgeDirection;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidStack;

+import net.minecraftforge.fluids.FluidTankInfo;

+import net.minecraftforge.fluids.IFluidHandler;

 

 public class PaperMachineTileEntity extends BasicElectricMotorTileEntity implements IFluidHandler

 {

diff --git a/ihl/processing/chemistry/RefluxCondenserTileEntity.java b/ihl/processing/chemistry/RefluxCondenserTileEntity.java
index b6cbcb0..83eb108 100644
--- a/ihl/processing/chemistry/RefluxCondenserTileEntity.java
+++ b/ihl/processing/chemistry/RefluxCondenserTileEntity.java
@@ -139,7 +139,10 @@ public class RefluxCondenserTileEntity extends TileEntity implements IWrenchable
 	@Override

 	public FluidTankInfo[] getTankInfo(ForgeDirection arg0) 

 	{

-		return columnBottom.getTankInfo(arg0);

+		if(columnBottom!=null)

+			return columnBottom.getTankInfo(arg0);

+		else

+			return new FluidTankInfo[] {new FluidTankInfo(null, 8000)};

 	}

 

 }

diff --git a/ihl/processing/chemistry/SolarEvaporatorContainer.java b/ihl/processing/chemistry/SolarEvaporatorContainer.java
new file mode 100644
index 0000000..4ecf44d
--- /dev/null
+++ b/ihl/processing/chemistry/SolarEvaporatorContainer.java
@@ -0,0 +1,112 @@
+package ihl.processing.chemistry;

+

+import ic2.core.ContainerBase;

+import ic2.core.slot.SlotInvSlot;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.inventory.ICrafting;

+import net.minecraft.inventory.Slot;

+import net.minecraftforge.fluids.FluidRegistry;

+import net.minecraftforge.fluids.FluidStack;

+

+public class SolarEvaporatorContainer extends ContainerBase<SolarEvaporatorTileEntity> {

+

+	protected SolarEvaporatorTileEntity tileEntity;

+	public int lastFluidAmount = -1;

+	public int lastFuel = -1;

+	public short lastProgress = -1;

+	private final static int height = 166;

+	public int lastNumberOfFluids = -1;

+    public int lastVisibleFluidID = -1;

+	public int lastVisibleFluidAmount = -1;

+

+	public SolarEvaporatorContainer(EntityPlayer entityPlayer, SolarEvaporatorTileEntity tileEntity1) {

+		super(tileEntity1);

+		this.tileEntity = tileEntity1;

+		int col;

+

+		for (col = 0; col < 3; ++col) {

+			for (int col1 = 0; col1 < 9; ++col1) {

+				this.addSlotToContainer(

+						new Slot(entityPlayer.inventory, col1 + col * 9 + 9, 8 + col1 * 18, height + -82 + col * 18));

+			}

+		}

+

+		for (col = 0; col < 9; ++col) {

+			this.addSlotToContainer(new Slot(entityPlayer.inventory, col, 8 + col * 18, height + -24));

+		}

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.fluidItemsSlot, 0, 44, 14));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.emptyFluidItemsSlot, 0, 44, 32));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.fillItemsSlot, 0, 44, 50));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.outputSlot, 0, 117, 32));

+

+	}

+

+	@Override

+	public void detectAndSendChanges() {

+		super.detectAndSendChanges();

+		for (int i = 0; i < this.crafters.size(); ++i) {

+			ICrafting icrafting = (ICrafting) this.crafters.get(i);

+

+			if (this.tileEntity.getFluidTank().getFluid() != null

+					&& this.tileEntity.getFluidTank().getFluidAmount() != this.lastFluidAmount) {

+				icrafting.sendProgressBarUpdate(this, 0, this.tileEntity.getFluidTank().getFluid().getFluid().getID());

+				icrafting.sendProgressBarUpdate(this, 1, this.tileEntity.getFluidTank().getFluidAmount());

+			}

+

+			if (this.tileEntity.fuel != this.lastFuel) {

+				icrafting.sendProgressBarUpdate(this, 2, this.tileEntity.fuel);

+			}

+

+			if (this.tileEntity.progress != this.lastProgress) {

+				icrafting.sendProgressBarUpdate(this, 3, this.tileEntity.progress);

+			}

+            if (this.tileEntity.visibleFluidId != this.lastVisibleFluidID)

+            {

+                icrafting.sendProgressBarUpdate(this, 4, this.tileEntity.visibleFluidId);

+            }

+            if (this.tileEntity.visibleFluidAmount != this.lastVisibleFluidAmount)

+            {

+                icrafting.sendProgressBarUpdate(this, 5, this.tileEntity.visibleFluidAmount);

+            }

+		}

+

+		this.lastFluidAmount = this.tileEntity.getFluidTank().getFluidAmount();

+		this.lastFuel = this.tileEntity.fuel;

+		this.lastProgress = this.tileEntity.progress;

+        this.lastVisibleFluidID=this.tileEntity.visibleFluidId;

+        this.lastVisibleFluidAmount=this.tileEntity.visibleFluidAmount;

+	}

+

+	@Override

+	public void updateProgressBar(int index, int value) {

+		super.updateProgressBar(index, value);

+

+		switch (index) {

+		case 0:

+			this.tileEntity.getFluidTank().setFluid(new FluidStack(FluidRegistry.getFluid(value), 1000));

+			break;

+		case 1:

+			this.tileEntity.getFluidTank()

+					.setFluid(new FluidStack(this.tileEntity.getFluidTank().getFluid().getFluid(), value));

+			break;

+		case 2:

+			this.tileEntity.fuel = value;

+			break;

+		case 3:

+			this.tileEntity.progress = (short) value;

+			break;

+        case 4:

+            this.tileEntity.visibleFluidId=value;

+            break;

+        case 5:

+            this.tileEntity.visibleFluidAmount=value;

+            break;

+

+		}

+	}

+

+	@Override

+	public boolean canInteractWith(EntityPlayer var1) {

+		return tileEntity.isUseableByPlayer(var1);

+	}

+}

diff --git a/ihl/processing/chemistry/SolarEvaporatorGui.java b/ihl/processing/chemistry/SolarEvaporatorGui.java
new file mode 100644
index 0000000..e97f9e0
--- /dev/null
+++ b/ihl/processing/chemistry/SolarEvaporatorGui.java
@@ -0,0 +1,78 @@
+package ihl.processing.chemistry;

+

+import org.lwjgl.opengl.GL11;

+

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

+import ic2.core.util.DrawUtil;

+import ic2.core.util.GuiTooltipHelper;

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

+import net.minecraft.client.renderer.texture.TextureMap;

+import net.minecraft.util.IIcon;

+import net.minecraft.util.ResourceLocation;

+import net.minecraft.util.StatCollector;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidStack;

+

+@SideOnly(Side.CLIENT)

+public class SolarEvaporatorGui extends GuiContainer {

+	private static final ResourceLocation background = new ResourceLocation("ihl",

+			"textures/gui/GUISolarEvaporator.png");

+	private SolarEvaporatorContainer container;

+

+	public SolarEvaporatorGui(SolarEvaporatorContainer container1) {

+		// the container is instanciated and passed to the superclass for

+		// handling

+		super(container1);

+		this.container = container1;

+	}

+

+	@Override

+	protected void drawGuiContainerForegroundLayer(int par1, int par2) {

+		int xOffset = (this.width - xSize) / 2;

+		int yOffset = (this.height - ySize) / 2;

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

+		this.mc.renderEngine.bindTexture(background);

+		int i1;

+		if (this.container.tileEntity.getActive()) {

+			this.drawTexturedModalRect(9, 16, 176, 0, 14, 14);

+		}

+		if (this.container.tileEntity.progress > 0) {

+			i1 = Math.min(this.container.tileEntity.gaugeProgressScaled(18), 18);

+			this.drawTexturedModalRect(99, 34, 198, 0, i1 + 1, 13);

+		}

+

+		if (this.container.tileEntity.getTankAmount() > 0) {

+			FluidStack fluidStack = this.container.tileEntity.getFluidTank().getFluid();

+			if (fluidStack != null) {

+				Fluid fluid = fluidStack.getFluid();

+				if (fluid != null) {

+

+					IIcon fluidIcon = fluid.getIcon();

+

+					if (fluidIcon != null) {

+						this.mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);

+						int liquidHeight = this.container.tileEntity.gaugeLiquidScaled(47);

+						DrawUtil.drawRepeated(fluidIcon, (82), 16 + 47 - liquidHeight, 12.0D, liquidHeight,

+								this.zLevel);

+						this.mc.renderEngine.bindTexture(background);

+					}

+				}

+				String tooltip = StatCollector.translateToLocal(fluidStack.getFluid().getUnlocalizedName()) + ": "

+						+ fluidStack.amount + "mB";

+				GuiTooltipHelper.drawAreaTooltip(par1 - 90, par2 - 32, tooltip, xOffset - 8, yOffset - 15, xOffset + 2,

+						yOffset + 30);

+			}

+		}

+	}

+

+	@Override

+	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {

+		// draw your Gui here, only thing you need to change is the path

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

+		this.mc.renderEngine.bindTexture(background);

+		int x = (width - xSize) / 2;

+		int y = (height - ySize) / 2;

+		this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize);

+	}

+}
\ No newline at end of file
diff --git a/ihl/processing/chemistry/SolarEvaporatorTileEntity.java b/ihl/processing/chemistry/SolarEvaporatorTileEntity.java
new file mode 100644
index 0000000..947a88a
--- /dev/null
+++ b/ihl/processing/chemistry/SolarEvaporatorTileEntity.java
@@ -0,0 +1,108 @@
+package ihl.processing.chemistry;
+
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import ic2.core.ContainerBase;
+import ic2.core.IC2;
+import ihl.interfaces.IFluidTankVisual;
+import ihl.utils.IHLUtils;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.EnumSkyBlock;
+
+public class SolarEvaporatorTileEntity extends EvaporatorTileEntity implements IFluidTankVisual {
+    public int visibleFluidId = -1;
+    public int visibleFluidAmount = 1;
+    
+	public SolarEvaporatorTileEntity(){
+		super();
+    	this.fuelSlot = null;
+    	this.maxProgress = 4500;
+	}
+	
+    @Override
+    public List<String> getNetworkedFields()
+    {
+        List<String> ret = super.getNetworkedFields();
+        ret.add("visibleFluidId");
+        ret.add("visibleFluidAmount");
+        return ret;
+    }
+	
+    @Override
+	public void updateEntityServer()
+    {
+    	super.updateEntityServer();
+		if(this.fluidTank.getFluid()!=null && (visibleFluidId!=this.fluidTank.getFluid().getFluid().getID() || visibleFluidAmount!=this.fluidTank.getFluidAmount()))
+		{
+			visibleFluidId = this.fluidTank.getFluid().getFluid().getID();
+			visibleFluidAmount = this.fluidTank.getFluidAmount();
+       		IC2.network.get().updateTileEntityField(this, "visibleFluidId");
+       		IC2.network.get().updateTileEntityField(this, "visibleFluidAmount");
+       	}
+		else if(this.fluidTank.getFluid()==null && visibleFluidId!=-1)
+       	{
+			visibleFluidId=-1;
+       		IC2.network.get().updateTileEntityField(this, "visibleFluidId");
+       	}
+    }
+	@Override
+    public boolean isBurning()
+    {
+		return this.worldObj.getSkyBlockTypeBrightness(EnumSkyBlock.Sky, xCoord, yCoord, zCoord)>=15;
+    }
+	
+    @Override
+	public ContainerBase<? extends EvaporatorTileEntity> getGuiContainer(EntityPlayer entityPlayer)
+    {
+        return new SolarEvaporatorContainer(entityPlayer, this);
+    }
+    
+    @Override
+	@SideOnly(Side.CLIENT)
+    public GuiScreen getGui(EntityPlayer entityPlayer, boolean isAdmin)
+    {
+        return new SolarEvaporatorGui(new SolarEvaporatorContainer(entityPlayer, this));
+    }
+    
+	@Override
+	public short getFacing()
+	{
+		return 3;
+	}
+	
+	@Override
+	public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
+		return false;
+	}
+	
+	@Override
+	public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
+		return IHLUtils.getThisModItemStack("solarEvaporator");
+	}
+
+	@Override
+	public int getVisibleFluidId() {
+		return this.visibleFluidId;
+	}
+
+	@Override
+	public int getVisibleFluidAmount() {
+		return this.visibleFluidAmount;
+	}
+
+	@Override
+	public float getRenderLiquidLevel()
+	{
+		return (float)this.visibleFluidAmount/(float)this.fluidTank.getCapacity()/2;
+	}
+	
+	@Override
+    public boolean shouldRenderInPass(int pass)
+    {
+        return pass==0;
+    }
+}
diff --git a/ihl/processing/invslots/IHLInvSlotOutput.java b/ihl/processing/invslots/IHLInvSlotOutput.java
index d683221..d5186e2 100644
--- a/ihl/processing/invslots/IHLInvSlotOutput.java
+++ b/ihl/processing/invslots/IHLInvSlotOutput.java
@@ -6,15 +6,14 @@ import java.util.List;
 import java.util.Map;

 import java.util.Map.Entry;

 

-import net.minecraft.item.Item;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.nbt.NBTTagList;

-

 import ic2.core.block.TileEntityInventory;

 import ic2.core.block.invslot.InvSlotOutput;

 import ihl.recipes.RecipeOutputItemStack;

 import ihl.utils.IHLUtils;

+import net.minecraft.item.Item;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.nbt.NBTTagList;

 

 public class IHLInvSlotOutput extends InvSlotOutput {

 

diff --git a/ihl/processing/invslots/InvSlotConsumableLiquidIHL.java b/ihl/processing/invslots/InvSlotConsumableLiquidIHL.java
index 0a3b664..7bb6ecc 100644
--- a/ihl/processing/invslots/InvSlotConsumableLiquidIHL.java
+++ b/ihl/processing/invslots/InvSlotConsumableLiquidIHL.java
@@ -4,16 +4,16 @@ import java.util.Iterator;
 

 import org.apache.commons.lang3.mutable.MutableObject;

 

+import ic2.core.block.TileEntityInventory;

+import ic2.core.block.invslot.InvSlotConsumableLiquid;

+import ic2.core.util.StackUtil;

+import ihl.utils.IHLUtils;

 import net.minecraft.item.Item;

 import net.minecraft.item.ItemStack;

 import net.minecraftforge.fluids.Fluid;

 import net.minecraftforge.fluids.FluidContainerRegistry;

 import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.IFluidContainerItem;

-import ic2.core.block.TileEntityInventory;

-import ic2.core.block.invslot.InvSlotConsumableLiquid;

-import ic2.core.util.StackUtil;

-import ihl.utils.IHLUtils;

 

 public class InvSlotConsumableLiquidIHL extends InvSlotConsumableLiquid{

 

diff --git a/ihl/processing/invslots/SlotInvSlotIronWorkbench.java b/ihl/processing/invslots/SlotInvSlotIronWorkbench.java
index 94354ea..7f00e06 100644
--- a/ihl/processing/invslots/SlotInvSlotIronWorkbench.java
+++ b/ihl/processing/invslots/SlotInvSlotIronWorkbench.java
@@ -1,8 +1,9 @@
 package ihl.processing.invslots;

 

-import net.minecraft.entity.player.EntityPlayer;

 import ic2.core.slot.SlotInvSlot;

-import ihl.flexible_cable.*;

+import ihl.flexible_cable.IronWorkbenchInvSlot;

+import ihl.flexible_cable.IronWorkbenchTileEntity;

+import net.minecraft.entity.player.EntityPlayer;

 

 public class SlotInvSlotIronWorkbench extends SlotInvSlot {

 

diff --git a/ihl/processing/invslots/SlotInvSlotOutputInProgress.java b/ihl/processing/invslots/SlotInvSlotOutputInProgress.java
index a1b3937..25c0673 100644
--- a/ihl/processing/invslots/SlotInvSlotOutputInProgress.java
+++ b/ihl/processing/invslots/SlotInvSlotOutputInProgress.java
@@ -1,8 +1,8 @@
 package ihl.processing.invslots;

 

-import net.minecraft.entity.player.EntityPlayer;

 import ic2.core.slot.SlotInvSlot;

 import ihl.flexible_cable.IronWorkbenchInvSlot;

+import net.minecraft.entity.player.EntityPlayer;

 

 public class SlotInvSlotOutputInProgress extends SlotInvSlot {

 

diff --git a/ihl/processing/metallurgy/AchesonFurnaceGui.java b/ihl/processing/metallurgy/AchesonFurnaceGui.java
index 7665635..6f8238a 100644
--- a/ihl/processing/metallurgy/AchesonFurnaceGui.java
+++ b/ihl/processing/metallurgy/AchesonFurnaceGui.java
@@ -1,9 +1,10 @@
 package ihl.processing.metallurgy;

 

+import org.lwjgl.opengl.GL11;

+

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

 import net.minecraft.util.ResourceLocation;

 import net.minecraft.util.StatCollector;

-import org.lwjgl.opengl.GL11;

 

 public class AchesonFurnaceGui extends GuiContainer {

 	protected static final ResourceLocation achesonFurnaceBackground = new ResourceLocation("ihl", "textures/gui/GUIAchesonFurnace.png");

diff --git a/ihl/processing/metallurgy/AchesonFurnanceTileEntity.java b/ihl/processing/metallurgy/AchesonFurnanceTileEntity.java
index 1692e62..75efd70 100644
--- a/ihl/processing/metallurgy/AchesonFurnanceTileEntity.java
+++ b/ihl/processing/metallurgy/AchesonFurnanceTileEntity.java
@@ -3,6 +3,8 @@ package ihl.processing.metallurgy;
 import java.util.List;

 import java.util.Map;

 

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.api.recipe.IRecipeInput;

 import ic2.core.ContainerBase;

 import ihl.IHLMod;

@@ -15,8 +17,6 @@ import ihl.utils.IHLUtils;
 import net.minecraft.client.gui.GuiScreen;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.ItemStack;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class AchesonFurnanceTileEntity extends MachineBaseTileEntity {

 

diff --git a/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java b/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java
index 14a9e71..f02abea 100644
--- a/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java
+++ b/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java
@@ -38,8 +38,8 @@ public abstract class BasicElectricMotorTileEntity extends FlexibleCableHolderBa
 	public BasicElectricMotorTileEntity() {

 		super();

 		energyConsume = IHLMod.config.machineryEnergyConsume/100d;

-		dischargeSlot = new IHLInvSlotDischarge(this, 1, Access.IO, 4, InvSlot.InvSide.BOTTOM);

-		upgradeSlot = new  InvSlotUpgradeIHL(this, 1, Access.IO, 4, InvSlot.InvSide.BOTTOM);

+		dischargeSlot = new IHLInvSlotDischarge(this, 1, Access.I, 4, InvSlot.InvSide.BOTTOM);

+		upgradeSlot = new  InvSlotUpgradeIHL(this, 1, Access.I, 4, InvSlot.InvSide.BOTTOM);

 	}

 

 	@Override

diff --git a/ihl/processing/metallurgy/CoilerRender.java b/ihl/processing/metallurgy/CoilerRender.java
index f3da8fa..26ee32f 100644
--- a/ihl/processing/metallurgy/CoilerRender.java
+++ b/ihl/processing/metallurgy/CoilerRender.java
@@ -1,11 +1,11 @@
 package ihl.processing.metallurgy;

-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraft.util.ResourceLocation;

 import org.lwjgl.opengl.GL11;

 

 import ic2.api.tile.IWrenchable;

 import ihl.IHLModInfo;

+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraft.util.ResourceLocation;

 

 public class CoilerRender extends TileEntitySpecialRenderer{

 private CoilerModel model = new CoilerModel();

diff --git a/ihl/processing/metallurgy/CoilerTileEntity.java b/ihl/processing/metallurgy/CoilerTileEntity.java
index 5fdcf13..3853a0e 100644
--- a/ihl/processing/metallurgy/CoilerTileEntity.java
+++ b/ihl/processing/metallurgy/CoilerTileEntity.java
@@ -2,6 +2,8 @@ package ihl.processing.metallurgy;
 

 import java.util.List;

 

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

 import ic2.core.block.invslot.InvSlotOutput;

@@ -10,8 +12,6 @@ import ihl.utils.IHLUtils;
 import net.minecraft.client.gui.GuiScreen;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.ItemStack;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class CoilerTileEntity extends BasicElectricMotorTileEntity implements IProductionLine{

 

diff --git a/ihl/processing/metallurgy/Crucible.java b/ihl/processing/metallurgy/Crucible.java
index 77f10a4..220b505 100644
--- a/ihl/processing/metallurgy/Crucible.java
+++ b/ihl/processing/metallurgy/Crucible.java
@@ -8,7 +8,19 @@ import java.util.Map;
 import cpw.mods.fml.common.registry.GameRegistry;

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

+import ic2.api.item.IItemHudInfo;

+import ic2.api.recipe.IRecipeInput;

+import ic2.api.recipe.RecipeInputOreDict;

+import ic2.core.IC2;

+import ic2.core.IHasGui;

+import ic2.core.item.IHandHeldInventory;

+import ic2.core.util.LiquidUtil;

+import ic2.core.util.StackUtil;

+import ihl.IHLCreativeTab;

+import ihl.IHLModInfo;

+import ihl.recipes.UniversalRecipeInput;

+import ihl.recipes.UniversalRecipeManager;

+import ihl.recipes.UniversalRecipeOutput;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.inventory.IInventory;

@@ -25,19 +37,6 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.IFluidContainerItem;

 import net.minecraftforge.fluids.IFluidHandler;

-import ic2.api.item.IItemHudInfo;

-import ic2.api.recipe.IRecipeInput;

-import ic2.api.recipe.RecipeInputOreDict;

-import ic2.core.IC2;

-import ic2.core.IHasGui;

-import ic2.core.item.IHandHeldInventory;

-import ic2.core.util.LiquidUtil;

-import ic2.core.util.StackUtil;

-import ihl.IHLCreativeTab;

-import ihl.IHLModInfo;

-import ihl.recipes.UniversalRecipeInput;

-import ihl.recipes.UniversalRecipeManager;

-import ihl.recipes.UniversalRecipeOutput;

 

 public class Crucible extends Item implements IHandHeldInventory, IFluidContainerItem, IItemHudInfo{

 

diff --git a/ihl/processing/metallurgy/CrucibleContainer.java b/ihl/processing/metallurgy/CrucibleContainer.java
index 647c277..20ec65e 100644
--- a/ihl/processing/metallurgy/CrucibleContainer.java
+++ b/ihl/processing/metallurgy/CrucibleContainer.java
@@ -1,12 +1,12 @@
 package ihl.processing.metallurgy;

 

+import ic2.core.ContainerBase;

+import ic2.core.IC2;

+import ic2.core.util.StackUtil;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.entity.player.EntityPlayerMP;

 import net.minecraft.inventory.Slot;

 import net.minecraft.item.ItemStack;

-import ic2.core.ContainerBase;

-import ic2.core.IC2;

-import ic2.core.util.StackUtil;

 

 public class CrucibleContainer extends ContainerBase<CrucibleInventory>

 {

diff --git a/ihl/processing/metallurgy/CrucibleGui.java b/ihl/processing/metallurgy/CrucibleGui.java
index e92347c..f05e7bb 100644
--- a/ihl/processing/metallurgy/CrucibleGui.java
+++ b/ihl/processing/metallurgy/CrucibleGui.java
@@ -2,6 +2,8 @@ package ihl.processing.metallurgy;
 

 import org.lwjgl.opengl.GL11;

 

+import ic2.core.util.DrawUtil;

+import ic2.core.util.GuiTooltipHelper;

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

 import net.minecraft.client.renderer.texture.TextureMap;

 import net.minecraft.item.ItemStack;

@@ -10,8 +12,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;

 import net.minecraftforge.fluids.Fluid;

 import net.minecraftforge.fluids.FluidStack;

-import ic2.core.util.DrawUtil;

-import ic2.core.util.GuiTooltipHelper;

 

 public class CrucibleGui extends GuiContainer

 {

diff --git a/ihl/processing/metallurgy/CrucibleInventory.java b/ihl/processing/metallurgy/CrucibleInventory.java
index cc5707a..253483f 100644
--- a/ihl/processing/metallurgy/CrucibleInventory.java
+++ b/ihl/processing/metallurgy/CrucibleInventory.java
@@ -2,6 +2,10 @@ package ihl.processing.metallurgy;
 

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ic2.core.ContainerBase;

+import ic2.core.IC2;

+import ic2.core.item.tool.HandHeldInventory;

+import ic2.core.util.StackUtil;

 import net.minecraft.client.gui.GuiScreen;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.entity.player.InventoryPlayer;

@@ -9,10 +13,6 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.nbt.NBTTagList;

-import ic2.core.ContainerBase;

-import ic2.core.IC2;

-import ic2.core.item.tool.HandHeldInventory;

-import ic2.core.util.StackUtil;

 

 public class CrucibleInventory extends HandHeldInventory {

 

diff --git a/ihl/processing/metallurgy/DetonationSprayingMachineGui.java b/ihl/processing/metallurgy/DetonationSprayingMachineGui.java
index 66d9acb..8cd29d0 100644
--- a/ihl/processing/metallurgy/DetonationSprayingMachineGui.java
+++ b/ihl/processing/metallurgy/DetonationSprayingMachineGui.java
@@ -5,15 +5,12 @@ import java.util.Iterator;
 import org.lwjgl.opengl.GL11;

 

 import codechicken.lib.gui.GuiDraw;

-

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

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

 import net.minecraft.util.ResourceLocation;

 import net.minecraft.util.StatCollector;

 

-import cpw.mods.fml.relauncher.Side;

-

-import cpw.mods.fml.relauncher.SideOnly;

-

 @SideOnly(Side.CLIENT)

 public class DetonationSprayingMachineGui extends GuiContainer {

 	private static final ResourceLocation background = new ResourceLocation("ihl", "textures/gui/GUIDetonationSprayingMachine.png");

diff --git a/ihl/processing/metallurgy/DetonationSprayingMachineRender.java b/ihl/processing/metallurgy/DetonationSprayingMachineRender.java
index ee64b65..b68f8b3 100644
--- a/ihl/processing/metallurgy/DetonationSprayingMachineRender.java
+++ b/ihl/processing/metallurgy/DetonationSprayingMachineRender.java
@@ -1,13 +1,13 @@
 package ihl.processing.metallurgy;

-import net.minecraft.client.renderer.entity.RenderManager;

-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraft.util.ResourceLocation;

 import org.lwjgl.opengl.GL11;

 

 import ic2.api.tile.IWrenchable;

 import ihl.IHLModInfo;

 import ihl.utils.IHLItemRenderer;

+import net.minecraft.client.renderer.entity.RenderManager;

+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraft.util.ResourceLocation;

 

 public class DetonationSprayingMachineRender extends TileEntitySpecialRenderer{

 private DetonationSprayingMachineModel model = new DetonationSprayingMachineModel();

diff --git a/ihl/processing/metallurgy/DetonationSprayingMachineTileEntity.java b/ihl/processing/metallurgy/DetonationSprayingMachineTileEntity.java
index ce594ed..411b8db 100644
--- a/ihl/processing/metallurgy/DetonationSprayingMachineTileEntity.java
+++ b/ihl/processing/metallurgy/DetonationSprayingMachineTileEntity.java
@@ -2,13 +2,9 @@ package ihl.processing.metallurgy;
 

 import java.util.List;

 import java.util.Map;

+

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

 import ic2.api.network.INetworkTileEntityEventListener;

 import ic2.api.recipe.IRecipeInput;

 import ic2.api.recipe.RecipeInputItemStack;

@@ -27,6 +23,10 @@ import ihl.recipes.UniversalRecipeInput;
 import ihl.recipes.UniversalRecipeManager;

 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

 

 public class DetonationSprayingMachineTileEntity extends TileEntityInventory implements IHasGui, INetworkTileEntityEventListener

 {

diff --git a/ihl/processing/metallurgy/ElectricEngineItem.java b/ihl/processing/metallurgy/ElectricEngineItem.java
index 59d6d07..c1e0003 100644
--- a/ihl/processing/metallurgy/ElectricEngineItem.java
+++ b/ihl/processing/metallurgy/ElectricEngineItem.java
@@ -6,14 +6,14 @@ import java.util.Iterator;
 import java.util.List;

 import java.util.Map;

 

-import net.minecraft.client.renderer.texture.IIconRegister;

-import net.minecraft.item.Item;

-import net.minecraft.util.IIcon;

 import cpw.mods.fml.common.registry.GameRegistry;

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

 import ihl.IHLCreativeTab;

 import ihl.IHLModInfo;

+import net.minecraft.client.renderer.texture.IIconRegister;

+import net.minecraft.item.Item;

+import net.minecraft.util.IIcon;

 

 public class ElectricEngineItem extends Item{

 	

diff --git a/ihl/processing/metallurgy/ExtruderModel.java b/ihl/processing/metallurgy/ExtruderModel.java
index fb28d50..fcff405 100644
--- a/ihl/processing/metallurgy/ExtruderModel.java
+++ b/ihl/processing/metallurgy/ExtruderModel.java
@@ -1,8 +1,8 @@
 package ihl.processing.metallurgy;
 
+import ihl.model.IHLModelRenderer;
 import net.minecraft.client.model.ModelBase;
 import net.minecraftforge.common.util.ForgeDirection;
-import ihl.model.IHLModelRenderer;
 
 public class ExtruderModel extends ModelBase
 {
diff --git a/ihl/processing/metallurgy/ExtruderTileEntity.java b/ihl/processing/metallurgy/ExtruderTileEntity.java
index 53447b4..a46ae62 100644
--- a/ihl/processing/metallurgy/ExtruderTileEntity.java
+++ b/ihl/processing/metallurgy/ExtruderTileEntity.java
@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;

 import java.util.Map;

 

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.core.ContainerBase;

 import ic2.core.block.invslot.InvSlot.Access;

 import ihl.processing.chemistry.ApparatusProcessableInvSlot;

@@ -21,8 +23,6 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.FluidTank;

 import net.minecraftforge.fluids.IFluidHandler;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class ExtruderTileEntity extends BasicElectricMotorTileEntity{

 

diff --git a/ihl/processing/metallurgy/GasWeldingStationGui.java b/ihl/processing/metallurgy/GasWeldingStationGui.java
index 6248159..79becd5 100644
--- a/ihl/processing/metallurgy/GasWeldingStationGui.java
+++ b/ihl/processing/metallurgy/GasWeldingStationGui.java
@@ -1,14 +1,14 @@
 package ihl.processing.metallurgy;

 

-import cpw.mods.fml.relauncher.Side;

+import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

 import ic2.core.IC2;

+import ihl.utils.IHLRenderUtils;

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

 import net.minecraft.inventory.Slot;

 import net.minecraft.util.ResourceLocation;

-import org.lwjgl.opengl.GL11;

-import ihl.utils.IHLRenderUtils;

 

 @SideOnly(Side.CLIENT)

 public class GasWeldingStationGui extends GuiContainer {

diff --git a/ihl/processing/metallurgy/GasWeldingStationTileEntity.java b/ihl/processing/metallurgy/GasWeldingStationTileEntity.java
index 54f4177..b7172c2 100644
--- a/ihl/processing/metallurgy/GasWeldingStationTileEntity.java
+++ b/ihl/processing/metallurgy/GasWeldingStationTileEntity.java
@@ -3,18 +3,9 @@ package ihl.processing.metallurgy;
 import java.util.Arrays;

 import java.util.List;

 import java.util.Map;

+

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.Fluid;

-import net.minecraftforge.fluids.FluidStack;

-import net.minecraftforge.fluids.FluidTankInfo;

-import net.minecraftforge.fluids.IFluidHandler;

 import ic2.api.network.INetworkClientTileEntityEventListener;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

@@ -32,6 +23,15 @@ import ihl.recipes.UniversalRecipeManager;
 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLFluidTank;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraftforge.common.util.ForgeDirection;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidStack;

+import net.minecraftforge.fluids.FluidTankInfo;

+import net.minecraftforge.fluids.IFluidHandler;

 

 public class GasWeldingStationTileEntity extends TileEntityInventory implements IHasGui, INetworkClientTileEntityEventListener, IFluidHandler, IWorkspaceElement

 {

diff --git a/ihl/processing/metallurgy/ImpregnatingMachineGui.java b/ihl/processing/metallurgy/ImpregnatingMachineGui.java
index c6a8b0f..29ba298 100644
--- a/ihl/processing/metallurgy/ImpregnatingMachineGui.java
+++ b/ihl/processing/metallurgy/ImpregnatingMachineGui.java
@@ -1,12 +1,12 @@
 package ihl.processing.metallurgy;

 

-import cpw.mods.fml.relauncher.Side;

+import org.lwjgl.opengl.GL11;

 

+import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ihl.utils.IHLRenderUtils;

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

 import net.minecraft.util.ResourceLocation;

-import org.lwjgl.opengl.GL11;

-import ihl.utils.IHLRenderUtils;

 

 @SideOnly(Side.CLIENT)

 public class ImpregnatingMachineGui extends GuiContainer {

diff --git a/ihl/processing/metallurgy/ImpregnatingMachineRender.java b/ihl/processing/metallurgy/ImpregnatingMachineRender.java
index 3231b71..9529186 100644
--- a/ihl/processing/metallurgy/ImpregnatingMachineRender.java
+++ b/ihl/processing/metallurgy/ImpregnatingMachineRender.java
@@ -1,53 +1,55 @@
 package ihl.processing.metallurgy;

+

+import org.lwjgl.opengl.GL11;

+

+import ihl.interfaces.IFluidTankVisual;

+import ihl.model.FluidRenderer;

 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

 import net.minecraft.tileentity.TileEntity;

 import net.minecraftforge.fluids.FluidRegistry;

 import net.minecraftforge.fluids.FluidStack;

 

-import org.lwjgl.opengl.GL11;

-

-import ihl.model.FluidRenderer;

+public class ImpregnatingMachineRender extends TileEntitySpecialRenderer {

 

-public class ImpregnatingMachineRender extends TileEntitySpecialRenderer{

+	private float cap;

 

+	public ImpregnatingMachineRender(float capIn) {

+		cap = capIn;

+	}

 

-	

-public ImpregnatingMachineRender(){}

+	public void renderAModelAt(IFluidTankVisual tile, double x, double y, double z, float f) {

+		GL11.glPushMatrix();

+		GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F);

+		float rotation = 0F;

+		GL11.glRotatef(-rotation, 0F, 1F, 0F);

+		GL11.glScalef(1F, -1F, -1F);

+		GL11.glTranslatef(0F, -1.0F, 0F);

+		GL11.glPopMatrix();

+		if (tile.getVisibleFluidId() == -1 || tile.getVisibleFluidAmount() <= 0) {

+			return;

+		}

+		FluidStack fluidStack = new FluidStack(FluidRegistry.getFluid(tile.getVisibleFluidId()),

+				tile.getVisibleFluidAmount());

+		GL11.glPushMatrix();

+		GL11.glPushAttrib(GL11.GL_ENABLE_BIT);

+		GL11.glEnable(GL11.GL_BLEND);

+		GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);

+		GL11.glTranslatef((float) x, (float) y + 0.1F, (float) z);

+		GL11.glScalef(0.99F, 0.8F * tile.getRenderLiquidLevel(), 0.99F);

+		int[] displayLists = FluidRenderer.getLiquidDisplayLists(fluidStack);

+		if (displayLists != null) {

+			float level = Math.min(fluidStack.amount, cap) / cap;

+			bindTexture(FluidRenderer.getFluidSheet(fluidStack));

+			GL11.glCallList(displayLists[(int) (level * (FluidRenderer.DISPLAY_STAGES - 1))]);

+		}

+		GL11.glDisable(GL11.GL_BLEND);

+		GL11.glPopAttrib();

+		GL11.glPopMatrix();

 

-public void renderAModelAt(ImpregnatingMachineTileEntity tile, double x, double y, double z, float f) {

-	GL11.glPushMatrix();

-	GL11.glTranslatef((float)x + 0.5F, (float)y+0.5F, (float)z + 0.5F);

-	float rotation=0F;

-	GL11.glRotatef(-rotation, 0F, 1F, 0F);

-    GL11.glScalef(1F, -1F, -1F);

-    GL11.glTranslatef(0F, -1.0F, 0F);

-	GL11.glPopMatrix();

-	if (tile.visibleFluidId == -1 || tile.visibleFluidAmount <= 0) {

-		return;

 	}

-	FluidStack fluidStack = new FluidStack(FluidRegistry.getFluid(tile.visibleFluidId),tile.visibleFluidAmount);

-	GL11.glPushMatrix();

-	GL11.glPushAttrib(GL11.GL_ENABLE_BIT);

-    GL11.glEnable(GL11.GL_BLEND);

-    GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);

-    GL11.glTranslatef((float) x, (float) y + 0.1F, (float) z);

-    GL11.glScalef(0.99F, 0.8F*tile.getRenderLiquidLevel(), 0.99F);

-    int[] displayLists = FluidRenderer.getLiquidDisplayLists(fluidStack);

-    if (displayLists != null) {

-        float cap = 900F;

-        float level = Math.min(fluidStack.amount, cap) / cap;

-        bindTexture(FluidRenderer.getFluidSheet(fluidStack));

-        GL11.glCallList(displayLists[(int) (level * (FluidRenderer.DISPLAY_STAGES - 1))]);

-    }

-    GL11.glDisable(GL11.GL_BLEND);

-    GL11.glPopAttrib();

-	GL11.glPopMatrix();

-

-}

 

 	@Override

-	public void renderTileEntityAt(TileEntity par1TileEntity, double par2, double par4, double par6, float par8)

-	{

-		this.renderAModelAt((ImpregnatingMachineTileEntity)par1TileEntity, par2, par4, par6, par8);

+	public void renderTileEntityAt(TileEntity tile, double par2, double par4, double par6, float par8) {

+		this.renderAModelAt((IFluidTankVisual) tile, par2, par4, par6, par8);

 	}

 }
\ No newline at end of file
diff --git a/ihl/processing/metallurgy/ImpregnatingMachineTileEntity.java b/ihl/processing/metallurgy/ImpregnatingMachineTileEntity.java
index 1a15f06..a0ed60d 100644
--- a/ihl/processing/metallurgy/ImpregnatingMachineTileEntity.java
+++ b/ihl/processing/metallurgy/ImpregnatingMachineTileEntity.java
@@ -3,19 +3,9 @@ package ihl.processing.metallurgy;
 import java.util.Arrays;

 import java.util.List;

 import java.util.Map;

+

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.Fluid;

-import net.minecraftforge.fluids.FluidRegistry;

-import net.minecraftforge.fluids.FluidStack;

-import net.minecraftforge.fluids.FluidTankInfo;

-import net.minecraftforge.fluids.IFluidHandler;

 import ic2.api.network.INetworkTileEntityEventListener;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

@@ -25,6 +15,7 @@ import ic2.core.block.invslot.InvSlot;
 import ic2.core.block.invslot.InvSlot.Access;

 import ic2.core.block.invslot.InvSlotConsumableLiquid;

 import ic2.core.block.invslot.InvSlotOutput;

+import ihl.interfaces.IFluidTankVisual;

 import ihl.interfaces.IHasTemperature;

 import ihl.processing.chemistry.ApparatusProcessableInvSlot;

 import ihl.processing.chemistry.ChemicalReactorTileEntity;

@@ -35,8 +26,18 @@ import ihl.recipes.UniversalRecipeManager;
 import ihl.recipes.UniversalRecipeOutput;

 import ihl.utils.IHLFluidTank;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraftforge.common.util.ForgeDirection;

+import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidRegistry;

+import net.minecraftforge.fluids.FluidStack;

+import net.minecraftforge.fluids.FluidTankInfo;

+import net.minecraftforge.fluids.IFluidHandler;

 

-public class ImpregnatingMachineTileEntity extends TileEntityInventory implements IHasGui,INetworkTileEntityEventListener, IFluidHandler, IHasTemperature

+public class ImpregnatingMachineTileEntity extends TileEntityInventory implements IHasGui,IFluidTankVisual,INetworkTileEntityEventListener, IFluidHandler, IHasTemperature

 {

 	private final static UniversalRecipeManager recipeManager = new UniversalRecipeManager("tub");

     public final ApparatusProcessableInvSlot input;

@@ -337,4 +338,14 @@ public class ImpregnatingMachineTileEntity extends TileEntityInventory implement
 	{

 		return this.fluidTank.getTemperature();

 	}

+

+	@Override

+	public int getVisibleFluidId() {

+		return this.visibleFluidId;

+	}

+

+	@Override

+	public int getVisibleFluidAmount() {

+		return this.visibleFluidAmount;

+	}

 }
\ No newline at end of file
diff --git a/ihl/processing/metallurgy/InjectionMoldBlock.java b/ihl/processing/metallurgy/InjectionMoldBlock.java
index 1cd18d3..bbea1cb 100644
--- a/ihl/processing/metallurgy/InjectionMoldBlock.java
+++ b/ihl/processing/metallurgy/InjectionMoldBlock.java
@@ -1,14 +1,17 @@
 package ihl.processing.metallurgy;

 

+import java.util.ArrayList;

+import java.util.List;

+import java.util.Locale;

+

+import cpw.mods.fml.common.registry.GameRegistry;

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ihl.IHLCreativeTab;

 import ihl.IHLModInfo;

 import ihl.items_blocks.IHLItemBlock;

 import ihl.metallurgy.constants.Details;

 import ihl.utils.IHLUtils;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Locale;

 import net.minecraft.block.Block;

 import net.minecraft.block.ITileEntityProvider;

 import net.minecraft.block.material.Material;

@@ -24,9 +27,6 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;

 import net.minecraft.world.World;

 import net.minecraftforge.fluids.FluidStack;

-import cpw.mods.fml.common.registry.GameRegistry;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class InjectionMoldBlock extends Block implements ITileEntityProvider{

 	

diff --git a/ihl/processing/metallurgy/InjectionMoldTileEntity.java b/ihl/processing/metallurgy/InjectionMoldTileEntity.java
index 33689ba..e5fee82 100644
--- a/ihl/processing/metallurgy/InjectionMoldTileEntity.java
+++ b/ihl/processing/metallurgy/InjectionMoldTileEntity.java
@@ -5,6 +5,12 @@ import java.util.Arrays;
 import java.util.List;

 import java.util.Map;

 

+import ic2.core.IC2;

+import ihl.metallurgy.constants.Details;

+import ihl.recipes.UniversalRecipeInput;

+import ihl.recipes.UniversalRecipeManager;

+import ihl.recipes.UniversalRecipeOutput;

+import ihl.utils.IHLUtils;

 import net.minecraft.entity.item.EntityItem;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

@@ -16,12 +22,6 @@ import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;

 import net.minecraftforge.fluids.IFluidHandler;

 import net.minecraftforge.oredict.OreDictionary;

-import ic2.core.IC2;

-import ihl.metallurgy.constants.Details;

-import ihl.recipes.UniversalRecipeInput;

-import ihl.recipes.UniversalRecipeManager;

-import ihl.recipes.UniversalRecipeOutput;

-import ihl.utils.IHLUtils;

 

 

 public class InjectionMoldTileEntity extends TileEntity implements IFluidHandler

diff --git a/ihl/processing/metallurgy/LathePart1TileEntity.java b/ihl/processing/metallurgy/LathePart1TileEntity.java
index ddf834b..788bfd4 100644
--- a/ihl/processing/metallurgy/LathePart1TileEntity.java
+++ b/ihl/processing/metallurgy/LathePart1TileEntity.java
@@ -1,6 +1,9 @@
 package ihl.processing.metallurgy;

 

 import java.util.List;

+

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.core.ContainerBase;

 import ihl.interfaces.IWorkspaceElement;

 import ihl.utils.IHLUtils;

@@ -9,8 +12,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

 import net.minecraft.tileentity.TileEntity;

 import net.minecraftforge.common.util.ForgeDirection;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class LathePart1TileEntity extends BasicElectricMotorTileEntity implements IWorkspaceElement{

 

diff --git a/ihl/processing/metallurgy/MachineBaseContainer.java b/ihl/processing/metallurgy/MachineBaseContainer.java
index 19985fe..d7e3ac7 100644
--- a/ihl/processing/metallurgy/MachineBaseContainer.java
+++ b/ihl/processing/metallurgy/MachineBaseContainer.java
@@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ICrafting;

 import net.minecraft.inventory.Slot;

 

-public class MachineBaseContainer extends ContainerBase {

+public class MachineBaseContainer extends ContainerBase<MachineBaseTileEntity> {

 

     protected MachineBaseTileEntity tileEntity;

     public int lastProgress = -1;

diff --git a/ihl/processing/metallurgy/MachineBaseTileEntity.java b/ihl/processing/metallurgy/MachineBaseTileEntity.java
index de20f5a..79763b5 100644
--- a/ihl/processing/metallurgy/MachineBaseTileEntity.java
+++ b/ihl/processing/metallurgy/MachineBaseTileEntity.java
@@ -1,5 +1,9 @@
 package ihl.processing.metallurgy;

 

+import java.util.List;

+

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.api.energy.event.EnergyTileLoadEvent;

 import ic2.api.energy.event.EnergyTileUnloadEvent;

 import ic2.api.energy.tile.IEnergySink;

@@ -10,15 +14,12 @@ import ic2.core.block.TileEntityInventory;
 import ic2.core.block.invslot.InvSlot.Access;

 import ihl.processing.chemistry.ApparatusProcessableInvSlot;

 import ihl.recipes.UniversalRecipeOutput;

-import java.util.List;

 import net.minecraft.client.gui.GuiScreen;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.tileentity.TileEntity;

 import net.minecraftforge.common.MinecraftForge;

 import net.minecraftforge.common.util.ForgeDirection;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public abstract class MachineBaseTileEntity extends TileEntityInventory implements IHasGui, IEnergySink

 {     

diff --git a/ihl/processing/metallurgy/MuffleFurnaceGui.java b/ihl/processing/metallurgy/MuffleFurnaceGui.java
index bf0df24..9c83401 100644
--- a/ihl/processing/metallurgy/MuffleFurnaceGui.java
+++ b/ihl/processing/metallurgy/MuffleFurnaceGui.java
@@ -1,9 +1,10 @@
 package ihl.processing.metallurgy;

 

+import org.lwjgl.opengl.GL11;

+

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

 import net.minecraft.util.ResourceLocation;

 import net.minecraft.util.StatCollector;

-import org.lwjgl.opengl.GL11;

 

 public class MuffleFurnaceGui extends GuiContainer {

 	protected static final ResourceLocation muffleFurnaceBackground = new ResourceLocation("ihl", "textures/gui/GUIAchesonFurnace.png");

diff --git a/ihl/processing/metallurgy/MuffleFurnanceTileEntity.java b/ihl/processing/metallurgy/MuffleFurnanceTileEntity.java
index 3994bd7..6f811cb 100644
--- a/ihl/processing/metallurgy/MuffleFurnanceTileEntity.java
+++ b/ihl/processing/metallurgy/MuffleFurnanceTileEntity.java
@@ -3,8 +3,9 @@ package ihl.processing.metallurgy;
 import java.util.List;

 import java.util.Map;

 

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.api.recipe.IRecipeInput;

-import ic2.api.recipe.RecipeInputOreDict;

 import ic2.core.ContainerBase;

 import ihl.IHLMod;

 import ihl.processing.invslots.IHLInvSlotOutput;

@@ -16,8 +17,6 @@ import ihl.utils.IHLUtils;
 import net.minecraft.client.gui.GuiScreen;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.ItemStack;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class MuffleFurnanceTileEntity extends MachineBaseTileEntity {

 

diff --git a/ihl/processing/metallurgy/RollingMachinePart1Model.java b/ihl/processing/metallurgy/RollingMachinePart1Model.java
index 460ff62..fe062f8 100644
--- a/ihl/processing/metallurgy/RollingMachinePart1Model.java
+++ b/ihl/processing/metallurgy/RollingMachinePart1Model.java
@@ -1,9 +1,9 @@
 package ihl.processing.metallurgy;
 
 
+import ihl.model.IHLModelRenderer;
 import net.minecraft.client.model.ModelBase;
 import net.minecraftforge.common.util.ForgeDirection;
-import ihl.model.IHLModelRenderer;
 
 
 public class RollingMachinePart1Model extends ModelBase
diff --git a/ihl/processing/metallurgy/RollingMachinePart1TileEntity.java b/ihl/processing/metallurgy/RollingMachinePart1TileEntity.java
index dc2d293..da60877 100644
--- a/ihl/processing/metallurgy/RollingMachinePart1TileEntity.java
+++ b/ihl/processing/metallurgy/RollingMachinePart1TileEntity.java
@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;

 import java.util.Map;

 

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.api.recipe.IRecipeInput;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

@@ -20,8 +22,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

 import net.minecraft.tileentity.TileEntity;

 import net.minecraftforge.common.util.ForgeDirection;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class RollingMachinePart1TileEntity extends BasicElectricMotorTileEntity{

 

diff --git a/ihl/processing/metallurgy/RollingMachinePart2Model.java b/ihl/processing/metallurgy/RollingMachinePart2Model.java
index b4bda67..39fd1f5 100644
--- a/ihl/processing/metallurgy/RollingMachinePart2Model.java
+++ b/ihl/processing/metallurgy/RollingMachinePart2Model.java
@@ -1,8 +1,8 @@
 package ihl.processing.metallurgy;
 
 
-import net.minecraft.client.model.ModelBase;
 import ihl.model.IHLModelRenderer;
+import net.minecraft.client.model.ModelBase;
 
 public class RollingMachinePart2Model extends ModelBase
 {
diff --git a/ihl/processing/metallurgy/RollingMachineRender.java b/ihl/processing/metallurgy/RollingMachineRender.java
index 1990769..f347a73 100644
--- a/ihl/processing/metallurgy/RollingMachineRender.java
+++ b/ihl/processing/metallurgy/RollingMachineRender.java
@@ -1,11 +1,11 @@
 package ihl.processing.metallurgy;

-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraft.util.ResourceLocation;

 import org.lwjgl.opengl.GL11;

 

 import ic2.api.tile.IWrenchable;

 import ihl.IHLModInfo;

+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraft.util.ResourceLocation;

 

 public class RollingMachineRender extends TileEntitySpecialRenderer{

 private RollingMachinePart1Model model = new RollingMachinePart1Model();

diff --git a/ihl/processing/metallurgy/VulcanizationExtrudingMoldModel.java b/ihl/processing/metallurgy/VulcanizationExtrudingMoldModel.java
index e3ab6c7..9ce0f01 100644
--- a/ihl/processing/metallurgy/VulcanizationExtrudingMoldModel.java
+++ b/ihl/processing/metallurgy/VulcanizationExtrudingMoldModel.java
@@ -1,8 +1,8 @@
 package ihl.processing.metallurgy;
 
+import ihl.model.IHLModelRenderer;
 import net.minecraft.client.model.ModelBase;
 import net.minecraftforge.common.util.ForgeDirection;
-import ihl.model.IHLModelRenderer;
 
 public class VulcanizationExtrudingMoldModel extends ModelBase
 {
diff --git a/ihl/processing/metallurgy/WireMillTileEntity.java b/ihl/processing/metallurgy/WireMillTileEntity.java
index f69ea9a..d93eb4f 100644
--- a/ihl/processing/metallurgy/WireMillTileEntity.java
+++ b/ihl/processing/metallurgy/WireMillTileEntity.java
@@ -4,13 +4,15 @@ import java.util.Arrays;
 import java.util.List;

 import java.util.Map;

 

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.api.recipe.IRecipeInput;

 import ic2.api.recipe.RecipeInputOreDict;

 import ic2.core.ContainerBase;

 import ic2.core.block.invslot.InvSlot;

+import ic2.core.block.invslot.InvSlot.Access;

 import ic2.core.block.invslot.InvSlotConsumableLiquid;

 import ic2.core.block.invslot.InvSlotOutput;

-import ic2.core.block.invslot.InvSlot.Access;

 import ihl.IHLMod;

 import ihl.items_blocks.IHLTool;

 import ihl.processing.chemistry.ApparatusProcessableInvSlot;

@@ -34,8 +36,6 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.FluidTankInfo;

 import net.minecraftforge.fluids.IFluidHandler;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class WireMillTileEntity extends BasicElectricMotorTileEntity implements IFluidHandler{

 

diff --git a/ihl/processing/metallurgy/WoodenRollingMachinePart1TileEntity.java b/ihl/processing/metallurgy/WoodenRollingMachinePart1TileEntity.java
index 4dd1f1c..857575a 100644
--- a/ihl/processing/metallurgy/WoodenRollingMachinePart1TileEntity.java
+++ b/ihl/processing/metallurgy/WoodenRollingMachinePart1TileEntity.java
@@ -3,6 +3,8 @@ package ihl.processing.metallurgy;
 import java.util.List;

 import java.util.Map;

 

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.api.recipe.IRecipeInput;

 import ic2.api.recipe.RecipeInputItemStack;

 import ic2.api.recipe.RecipeInputOreDict;

@@ -21,8 +23,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

 import net.minecraft.tileentity.TileEntity;

 import net.minecraftforge.common.util.ForgeDirection;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class WoodenRollingMachinePart1TileEntity extends BasicElectricMotorTileEntity{

 

diff --git a/ihl/processing/metallurgy/WoodenRollingMachinePart2Model.java b/ihl/processing/metallurgy/WoodenRollingMachinePart2Model.java
index 2673124..6ebc58e 100644
--- a/ihl/processing/metallurgy/WoodenRollingMachinePart2Model.java
+++ b/ihl/processing/metallurgy/WoodenRollingMachinePart2Model.java
@@ -6,9 +6,9 @@
 
 package ihl.processing.metallurgy;
 
+import ihl.model.IHLModelRenderer;
 import net.minecraft.client.model.ModelBase;
 import net.minecraftforge.common.util.ForgeDirection;
-import ihl.model.IHLModelRenderer;
 
 public class WoodenRollingMachinePart2Model extends ModelBase
 {
diff --git a/ihl/processing/metallurgy/WoodenRollingMachineRender.java b/ihl/processing/metallurgy/WoodenRollingMachineRender.java
index f5fd12a..f180f75 100644
--- a/ihl/processing/metallurgy/WoodenRollingMachineRender.java
+++ b/ihl/processing/metallurgy/WoodenRollingMachineRender.java
@@ -1,11 +1,11 @@
 package ihl.processing.metallurgy;

-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraft.util.ResourceLocation;

 import org.lwjgl.opengl.GL11;

 

 import ic2.api.tile.IWrenchable;

 import ihl.IHLModInfo;

+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraft.util.ResourceLocation;

 

 public class WoodenRollingMachineRender extends TileEntitySpecialRenderer{

 private WoodenRollingMachinePart1Model model = new WoodenRollingMachinePart1Model();