fixing bugs with Iron workbench and fractionator

36 files changed, 171 insertions, 159 deletions

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();