Fixed an ore dictionary recipes of Iron workbench which using wrong set of items. Fixed wire recipe input. All recipes of Iron workbench now use fluid container input and will drop an empty container.

4 files changed, 342 insertions, 416 deletions

diff --git a/ihl/processing/metallurgy/AchesonFurnanceTileEntity.java b/ihl/processing/metallurgy/AchesonFurnanceTileEntity.java
index 0c1b75f..5709cb9 100644
--- a/ihl/processing/metallurgy/AchesonFurnanceTileEntity.java
+++ b/ihl/processing/metallurgy/AchesonFurnanceTileEntity.java
@@ -20,28 +20,28 @@ import net.minecraft.item.ItemStack;
 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

 

-public class AchesonFurnanceTileEntity extends MachineBaseTileEntity{

+public class AchesonFurnanceTileEntity extends MachineBaseTileEntity {

 

-    public final ApparatusProcessableInvSlot inputElectrode;

+	public final ApparatusProcessableInvSlot inputElectrode;

 	protected static UniversalRecipeManager recipeManager = new UniversalRecipeManager("achesonfurnace");

-	private final RecipeInputOreDict[] validElectrodeTypes=new RecipeInputOreDict[] {new RecipeInputOreDict("stickCoal"),new RecipeInputOreDict("stickGraphite"),new RecipeInputOreDict("plateCoal"),new RecipeInputOreDict("plateGraphite")};

-	

-	public AchesonFurnanceTileEntity()

-	{

+	private final RecipeInputOreDict[] validElectrodeTypes = new RecipeInputOreDict[] {

+			new RecipeInputOreDict("stickCoal"), new RecipeInputOreDict("stickGraphite"),

+			new RecipeInputOreDict("plateCoal"), new RecipeInputOreDict("plateGraphite") };

+

+	public AchesonFurnanceTileEntity() {

 		super(2);

 		inputElectrode = new ApparatusProcessableInvSlot(this, "inputElectrode", 1, Access.IO, 2, 1);

 	}

-	

-	public static void addRecipe(IRecipeInput input1, IRecipeInput input2, String output1)

-	{

-		recipeManager.addRecipe(new UniversalRecipeInput(null,new IRecipeInput [] {input1,input2}),new UniversalRecipeOutput(null,new ItemStack [] {IHLUtils.getThisModItemStack(output1)},20));

+

+	public static void addRecipe(IRecipeInput input1, IRecipeInput input2, String output1) {

+		recipeManager.addRecipe(new UniversalRecipeInput(null, new IRecipeInput[] { input1, input2 }),

+				new UniversalRecipeOutput(null, new ItemStack[] { IHLUtils.getThisModItemStack(output1) }, 20));

 	}

 

 	@Override

-    public String getStartSoundFile()

-    {

-        return "Machines/Electro Furnace/ElectroFurnaceLoop.ogg";

-    }

+	public String getStartSoundFile() {

+		return "Machines/Electro Furnace/ElectroFurnaceLoop.ogg";

+	}

 

 	@Override

 	public String getLoopSoundFile() {

@@ -68,80 +68,63 @@ public class AchesonFurnanceTileEntity extends MachineBaseTileEntity{
 	public ContainerBase<?> getGuiContainer(EntityPlayer player) {

 		return new AchesonFurnanceContainer(player, this);

 	}

-	

+

 	@Override

-	public void operate() 

-	{

-		List<RecipeOutputItemStack> output = AchesonFurnanceTileEntity.recipeManager.getOutputFor(getInput(), true, true).getItemOutputs();

-		for(int i=0; i<this.inputElectrode.size();i++)

-		{

+	public void operate() {

+		List<RecipeOutputItemStack> output = AchesonFurnanceTileEntity.recipeManager

+				.getOutputFor(getInput(), true, true).getItemOutputs();

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

 			ItemStack electrodeIS = this.inputElectrode.get(i);

-			if(this.validElectrodeTypes[0].matches(electrodeIS))

-			{

+			if (this.validElectrodeTypes[0].matches(electrodeIS)) {

 				this.inputElectrode.put(i, IHLUtils.getThisModItemStack("stickGraphite"));

-			}

-			else if(this.validElectrodeTypes[2].matches(electrodeIS))

-			{

+			} else if (this.validElectrodeTypes[2].matches(electrodeIS)) {

 				this.inputElectrode.put(i, IHLUtils.getThisModItemStack("plateGraphite"));

 			}

 		}

-		for(int i=0; i<this.input.size();i++)

-		{

-			if(output.size()>i)

-			{

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

+			if (output.size() > i) {

 				ItemStack stack = output.get(i).itemStack.copy();

-				stack.stackSize=Math.round(output.get(i).quantity);

-				this.input.put(i,stack);

+				stack.stackSize = Math.round(output.get(i).quantity);

+				this.input.put(i, stack);

 			}

-			if(this.input.get(i)!=null && this.input.get(i).stackSize<=0)

-			{

+			if (this.input.get(i) != null && this.input.get(i).stackSize <= 0) {

 				this.input.put(i, null);

 			}

 		}

-        ItemStack crucible = input.getItemStack(IHLMod.crucible);

-        if(crucible!=null)

-        {

-        	((Crucible)crucible.getItem()).processContent(crucible, this);

-        }

+		ItemStack crucible = input.getItemStack(IHLMod.crucible);

+		if (crucible != null) {

+			((Crucible) crucible.getItem()).processContent(crucible, this);

+		}

 	}

-	

+

 	@Override

-	public boolean canOperate()

-	{

-		return this.isValidElectrode(this.inputElectrode.get(0)) && 

-				this.isValidElectrode(this.inputElectrode.get(1)) && 

-				this.getOutput()!=null;

+	public boolean canOperate() {

+		return this.isValidElectrode(this.inputElectrode.get(0)) && this.isValidElectrode(this.inputElectrode.get(1))

+				&& this.getOutput() != null;

 	}

-	

+

 	@Override

-	public List<?>[] getInput()

-	{

-		return new List[] {null, this.input.getItemStackList()};

+	public List<?>[] getInput() {

+		return new List[] { null, this.input.getItemStackList() };

 	}

-	

 

 	public static Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipes() {

 		return recipeManager.getRecipes();

 	}

-	

-    @Override

-	public UniversalRecipeOutput getOutput()

-    {

-    	return AchesonFurnanceTileEntity.recipeManager.getOutputFor(this.getInput(), false, false);

-    }

-    

-    private boolean isValidElectrode(ItemStack stack)

-    {

-    	if(stack!=null)

-    	{

-        	for(int i=0;i<this.validElectrodeTypes.length;i++)

-        	{

-        		if(validElectrodeTypes[i].matches(stack))

-        		{

-        			return true;

-        		}

-        	}

-    	}

-    	return false;

-    }

+

+	@Override

+	public UniversalRecipeOutput getOutput() {

+		return AchesonFurnanceTileEntity.recipeManager.getOutputFor(this.getInput(), false, false);

+	}

+

+	private boolean isValidElectrode(ItemStack stack) {

+		if (stack != null) {

+			for (int i = 0; i < this.validElectrodeTypes.length; i++) {

+				if (validElectrodeTypes[i].matches(stack)) {

+					return true;

+				}

+			}

+		}

+		return false;

+	}

 }

diff --git a/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java b/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java
index 47cfda9..a2fa219 100644
--- a/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java
+++ b/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java
@@ -21,125 +21,116 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.MinecraftForge;

 import net.minecraftforge.common.util.ForgeDirection;

 

-public abstract class BasicElectricMotorTileEntity extends FlexibleCableHolderBaseTileEntity implements IHasGui, INetworkClientTileEntityEventListener, IEnergySink{

+public abstract class BasicElectricMotorTileEntity extends FlexibleCableHolderBaseTileEntity

+		implements IHasGui, INetworkClientTileEntityEventListener, IEnergySink {

 

-    public final IHLInvSlotDischarge dischargeSlot;

+	public final IHLInvSlotDischarge dischargeSlot;

 	public short progress;

-	protected short operationLength=600;

-	protected final double energyConsume=0.1D;

-    public double energy;

-    public int maxStorage=128;

-	private boolean addedToEnergyNet=false;

-	

-	public BasicElectricMotorTileEntity()

-	{

+	protected short operationLength = 600;

+	protected double energyConsume = 1d;

+	public double energy;

+	public int maxStorage = 128;

+	private boolean addedToEnergyNet = false;

+

+	public BasicElectricMotorTileEntity() {

 		super();

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

 	}

-	

 

 	@Override

 	public String getInventoryName() {

 		return "Lathe";

 	}

-	

-    public boolean enableUpdateEntity()

-    {

-        return IC2.platform.isSimulating();

-    }

-	

-    @Override

-	public void onLoaded()

-    {

-        super.onLoaded();

-        if (IC2.platform.isSimulating()&&!this.addedToEnergyNet)

-        {

-            MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));

-            this.addedToEnergyNet = true;

-        }

-    }

-    

-    @Override

-	public void onUnloaded()

-    {

-        if (IC2.platform.isSimulating()&&this.addedToEnergyNet)

-        {

-            MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));

-            this.addedToEnergyNet = false;

-        }

-        

-        super.onUnloaded();

-    }

-    

-	

+

+	public boolean enableUpdateEntity() {

+		return IC2.platform.isSimulating();

+	}

+

+	@Override

+	public void onLoaded() {

+		super.onLoaded();

+		if (IC2.platform.isSimulating() && !this.addedToEnergyNet) {

+			MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));

+			this.addedToEnergyNet = true;

+		}

+	}

+

+	@Override

+	public void onUnloaded() {

+		if (IC2.platform.isSimulating() && this.addedToEnergyNet) {

+			MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));

+			this.addedToEnergyNet = false;

+		}

+

+		super.onUnloaded();

+	}

+

 	@SuppressWarnings("unchecked")

 	@Override

-	public void setFacing(short facing1)

-	{

+	public void setFacing(short facing1) {

 		short facing2 = (short) Math.max(facing1, 2);

-		double d=0.3D;

-		double f=-0.1D;

-        if (IC2.platform.isSimulating()&&this.addedToEnergyNet)

-        {

-            MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));

-            this.addedToEnergyNet = false;

-        }

+		double d = 0.3D;

+		double f = -0.1D;

+		if (IC2.platform.isSimulating() && this.addedToEnergyNet) {

+			MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));

+			this.addedToEnergyNet = false;

+		}

 		double range = 2D;

-		AxisAlignedBB searchArea = AxisAlignedBB.getBoundingBox(connectionX-range,connectionY-range,connectionZ-range,connectionX+range,connectionY+range,connectionZ+range);

+		AxisAlignedBB searchArea = AxisAlignedBB.getBoundingBox(connectionX - range, connectionY - range,

+				connectionZ - range, connectionX + range, connectionY + range, connectionZ + range);

 		List<NodeEntity> nodeList = worldObj.getEntitiesWithinAABB(NodeEntity.class, searchArea);

 		super.setFacing(facing2);

-		switch(getFacing())

-		{

-			case 4:

-				setConnectionX(this.xCoord+0.5D);

-				setConnectionY(this.yCoord+d);

-				setConnectionZ(this.zCoord+1D-f);

-				break;

-			case 5:

-				setConnectionX(this.xCoord+0.5D);

-				setConnectionY(this.yCoord+d);

-				setConnectionZ(this.zCoord+f);

-				break;

-			case 2:

-				setConnectionX(this.xCoord+1D-f);

-				setConnectionY(this.yCoord+d);

-				setConnectionZ(this.zCoord+0.5D);

-				break;

-			case 3:

-				setConnectionX(this.xCoord+f);

-				setConnectionY(this.yCoord+d);

-				setConnectionZ(this.zCoord+0.5D);

-				break;

-			default:

-				setConnectionX(this.xCoord+1D-f);

-				setConnectionY(this.yCoord+d);

-				setConnectionZ(this.zCoord+0.5D);

-				break;

-				

+		switch (getFacing()) {

+		case 4:

+			setConnectionX(this.xCoord + 0.5D);

+			setConnectionY(this.yCoord + d);

+			setConnectionZ(this.zCoord + 1D - f);

+			break;

+		case 5:

+			setConnectionX(this.xCoord + 0.5D);

+			setConnectionY(this.yCoord + d);

+			setConnectionZ(this.zCoord + f);

+			break;

+		case 2:

+			setConnectionX(this.xCoord + 1D - f);

+			setConnectionY(this.yCoord + d);

+			setConnectionZ(this.zCoord + 0.5D);

+			break;

+		case 3:

+			setConnectionX(this.xCoord + f);

+			setConnectionY(this.yCoord + d);

+			setConnectionZ(this.zCoord + 0.5D);

+			break;

+		default:

+			setConnectionX(this.xCoord + 1D - f);

+			setConnectionY(this.yCoord + d);

+			setConnectionZ(this.zCoord + 0.5D);

+			break;

+

 		}

-		if(!nodeList.isEmpty())

-		{

+		if (!nodeList.isEmpty()) {

 			Iterator<NodeEntity> ei = nodeList.iterator();

-        	while(ei.hasNext())

-        	{

-        		NodeEntity ne= ei.next();

-        		if((ne.prevAnchorEntity==null||ne.nextAnchorEntity==null) && this.cableListContains(ne.getChainUniqueID()))

-        		{

-        			ne.setVirtualNodePos(connectionX,connectionY,connectionZ);

-        		}

-        	}

+			while (ei.hasNext()) {

+				NodeEntity ne = ei.next();

+				if ((ne.prevAnchorEntity == null || ne.nextAnchorEntity == null)

+						&& this.cableListContains(ne.getChainUniqueID())) {

+					ne.setVirtualNodePos(connectionX, connectionY, connectionZ);

+				}

+			}

+		}

+		if (IC2.platform.isSimulating() && !this.addedToEnergyNet) {

+			MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));

+			this.addedToEnergyNet = true;

 		}

-        if (IC2.platform.isSimulating()&&!this.addedToEnergyNet)

-        {

-            MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));

-            this.addedToEnergyNet = true;

-        }

 	}

-	

+

 	@Override

-	public double getDemandedEnergy() 

-	{

-		return this.maxStorage-this.energy;

+	public double getDemandedEnergy() {

+		if(this.maxStorage - this.energy <= 1d)

+		{

+			return 0d;

+		}

+		return this.maxStorage - this.energy;

 	}

 

 	@Override

@@ -148,154 +139,126 @@ public abstract class BasicElectricMotorTileEntity extends FlexibleCableHolderBa
 	}

 

 	@Override

-	public double injectEnergy(ForgeDirection directionFrom, double amount,

-			double voltage) {

-			if(this.energy<this.maxStorage)

-			{

-				this.energy+=amount;

-	            return 0.0D;

-			}

-	        else

-	        {

-	            return amount;

-	        }

+	public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) {

+		if (this.energy < this.maxStorage) {

+			this.energy += amount;

+			return 0.0D;

+		} else {

+			return amount;

+		}

 	}

-	

+

 	@Override

-	public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) 

-	{

-		return this.getFacing()!=(short)side;

+	public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {

+		return this.getFacing() != (short) side;

 	}

-	

 

 	@Override

 	public void writeToNBT(NBTTagCompound nbt) {

-        super.writeToNBT(nbt);

-        nbt.setShort("progress", this.progress);

-        nbt.setDouble("energy", this.energy);

+		super.writeToNBT(nbt);

+		nbt.setShort("progress", this.progress);

+		nbt.setDouble("energy", this.energy);

 	}

 

 	@Override

 	public void readFromNBT(NBTTagCompound nbt) {

-        super.readFromNBT(nbt);

-        this.progress = nbt.getShort("progress");

-        this.energy=nbt.getDouble("energy");

+		super.readFromNBT(nbt);

+		this.progress = nbt.getShort("progress");

+		this.energy = nbt.getDouble("energy");

 	}

 

 	@Override

-	public void onNetworkEvent(EntityPlayer player, int event) 

-	{

-		switch(event)

-		{

+	public void onNetworkEvent(EntityPlayer player, int event) {

+		switch (event) {

 		case 0:

 			break;

-		}	

+		}

 	}

-	

+

 	public abstract void operate();

-	

-    @Override

-	public void updateEntityServer()

-    {

-    	if(this.getDemandedEnergy() > 1.0D)

-    	{

-    		double amount = this.dischargeSlot.discharge(this.getDemandedEnergy(), false);

-    		this.energy += amount;

-    	}

-        if(this.gridID!=-1 && this.getGrid().energy>0D && this.energy<this.maxStorage)

-        {

-           	this.energy+=energyConsume*10D;

-           	this.getGrid().drawEnergy(energyConsume*10D, this);

-        }

-        if (this.canOperate() && this.energy>=this.energyConsume)

-        {

-            this.energy-=this.energyConsume;

-            if (this.progress == 0)

-            {

-                IC2.network.get().initiateTileEntityEvent(this, 0, true);

-            }

-            ++this.progress;

-            if (this.progress >= this.operationLength)

-            {

-                this.operate();

-                this.progress = 0;

-                IC2.network.get().initiateTileEntityEvent(this, 2, true);

-            }

-        }

-        else

-        {

-            if (this.progress != 0 && this.getActive())

-            {

-                IC2.network.get().initiateTileEntityEvent(this, 1, true);

-            }

-            if (!this.canOperate())

-            {

-                this.progress = 0;

-            }

-        }

-    	

-    }

-	

+

+	@Override

+	public void updateEntityServer() {

+		if (this.getDemandedEnergy() > 1.0D) {

+			double amount = this.dischargeSlot.discharge(this.getDemandedEnergy(), false);

+			this.energy += amount;

+		}

+		if (this.gridID != -1 && this.getGrid().energy > 0D && this.energy < this.maxStorage) {

+			this.energy += energyConsume * 10D;

+			this.getGrid().drawEnergy(energyConsume * 10D, this);

+		}

+		if (this.canOperate() && this.energy >= this.energyConsume) {

+			this.energy -= this.energyConsume;

+			if (this.progress == 0) {

+				IC2.network.get().initiateTileEntityEvent(this, 0, true);

+			}

+			++this.progress;

+			if (this.progress >= this.operationLength) {

+				this.operate();

+				this.progress = 0;

+				IC2.network.get().initiateTileEntityEvent(this, 2, true);

+			}

+		} else {

+			if (this.progress != 0 && this.getActive()) {

+				IC2.network.get().initiateTileEntityEvent(this, 1, true);

+			}

+			if (!this.canOperate()) {

+				this.progress = 0;

+			}

+		}

+

+	}

+

 	public abstract List<?>[] getInput();

+

 	public abstract boolean canOperate();

-	@Override

-	public void onGuiClosed(EntityPlayer arg0) {}

 

-	public int getEnergy() 

-	{

-		return (int)this.energy;

+	@Override

+	public void onGuiClosed(EntityPlayer arg0) {

 	}

 

+	public int getEnergy() {

+		return (int) this.energy;

+	}

 

 	public int getGUIEnergy(int i) {

-    	if(this.energy<Float.MAX_VALUE)

-    	{

-    		return Math.round((float)this.energy/this.maxStorage*i);

-    	}

-    	else

-    	{

-    		return Math.round((float)(this.energy/this.maxStorage)*i);

-    	}

+		if (this.energy < Float.MAX_VALUE) {

+			return Math.round((float) this.energy / this.maxStorage * i);

+		} else {

+			return Math.round((float) (this.energy / this.maxStorage) * i);

+		}

 	}

-	

-    public int gaugeProgressScaled(int i)

-    {

-        return this.progress * i / this.operationLength;

-    }

-

 

-	public void setEnergy(int value) 

-	{

-		this.energy=value;

+	public int gaugeProgressScaled(int i) {

+		return this.progress * i / this.operationLength;

 	}

 

+	public void setEnergy(int value) {

+		this.energy = value;

+	}

 

 	@Override

 	public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) {

 		return true;

 	}

-	

+

 	@Override

-	public double getMaxAllowableVoltage() 

-	{

+	public double getMaxAllowableVoltage() {

 		return 64000D;

 	}

-	

+

 	@Override

-	public double getEnergyAmountThisNodeWant()

-	{

-		return this.energy-this.maxStorage;

+	public double getEnergyAmountThisNodeWant() {

+		return this.energy - this.maxStorage;

 	}

-	

-	public double drawEnergyToGrid(double amount)

-	{

+

+	public double drawEnergyToGrid(double amount) {

 		return 0d;

 	}

-	

+

 	@Override

-	public void injectEnergyInThisNode(double amount, double voltage) 

-	{

-		this.energy+=amount;

+	public void injectEnergyInThisNode(double amount, double voltage) {

+		this.energy += amount;

 	}

 

 }

diff --git a/ihl/processing/metallurgy/VulcanizationExtrudingMoldTileEntity.java b/ihl/processing/metallurgy/VulcanizationExtrudingMoldTileEntity.java
index 40d44e4..e052ad7 100644
--- a/ihl/processing/metallurgy/VulcanizationExtrudingMoldTileEntity.java
+++ b/ihl/processing/metallurgy/VulcanizationExtrudingMoldTileEntity.java
@@ -9,6 +9,8 @@ import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;

 import ic2.api.energy.tile.IEnergySink;

 import ic2.api.network.INetworkDataProvider;

+import ic2.api.recipe.IRecipeInput;

+import ic2.api.recipe.RecipeInputItemStack;

 import ic2.api.tile.IWrenchable;

 import ic2.core.IC2;

 import ihl.items_blocks.FlexibleCableItem;

@@ -28,144 +30,127 @@ import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;

 import net.minecraftforge.fluids.IFluidHandler;

 

-public class VulcanizationExtrudingMoldTileEntity extends TileEntity implements IWrenchable, INetworkDataProvider, IEnergySink, IProductionLine, IFluidHandler{

+public class VulcanizationExtrudingMoldTileEntity extends TileEntity

+		implements IWrenchable, INetworkDataProvider, IEnergySink, IProductionLine, IFluidHandler {

 

-	private short facing=2;

-	private short lastFacing=2;

-    public double energy;

-    public int maxStorage=64;

-	private double energyConsume=16D;

-	private boolean addedToEnergyNet=false;

+	private short facing = 2;

+	private short lastFacing = 2;

+	public double energy;

+	public int maxStorage = 64;

+	private double energyConsume = 16D;

+	private boolean addedToEnergyNet = false;

 	private FluidTank fluidTank = new FluidTank(5000);

-	protected static final UniversalRecipeManager recipeManager = new UniversalRecipeManager("vulcanizationextrudingmold");

+	protected static final UniversalRecipeManager recipeManager = new UniversalRecipeManager(

+			"vulcanizationextrudingmold");

 

-	public VulcanizationExtrudingMoldTileEntity()

-	{

+	public VulcanizationExtrudingMoldTileEntity() {

 		super();

 	}

-	

-    public static void addRecipe(FluidStack inputFluid,ItemStack input,ItemStack output1)

-    {

-    	recipeManager.addRecipe(new UniversalRecipeInput((new FluidStack[] {inputFluid}),(new ItemStack[] {input})),new UniversalRecipeOutput(null,(new ItemStack[] {output1}),200));

-    }

-	

-    public boolean enableUpdateEntity()

-    {

-        return IC2.platform.isSimulating();

-    }

-    

-    @Override

-	public void invalidate()

-    {

-        if (IC2.platform.isSimulating()&&this.addedToEnergyNet)

-        {

-            MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));

-            this.addedToEnergyNet = false;

-        }

-        super.invalidate();

-    }

-	

+

+	public static void addRecipe(FluidStack inputFluid, ItemStack input, ItemStack output1) {

+		recipeManager.addRecipe(

+				new UniversalRecipeInput((new FluidStack[] { inputFluid }),

+						(new IRecipeInput[] { new RecipeInputItemStack(input) })),

+				new UniversalRecipeOutput(null, (new ItemStack[] { output1 }), 200));

+	}

+

+	public boolean enableUpdateEntity() {

+		return IC2.platform.isSimulating();

+	}

+

+	@Override

+	public void invalidate() {

+		if (IC2.platform.isSimulating() && this.addedToEnergyNet) {

+			MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));

+			this.addedToEnergyNet = false;

+		}

+		super.invalidate();

+	}

+

 	@Override

-    public List<String> getNetworkedFields()

-    {

-		List<String> fields = new ArrayList();

+	public List<String> getNetworkedFields() {

+		List<String> fields = new ArrayList<String>();

 		fields.add("facing");

 		return fields;

-    }

-	

-    @Override

-	public void updateEntity()

-    {

-        super.updateEntity();

-        if (IC2.platform.isSimulating()&&!this.addedToEnergyNet)

-        {

-            MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));

-            this.addedToEnergyNet = true;

-        }

-

-        if(lastFacing!=facing)

-        {

+	}

+

+	@Override

+	public void updateEntity() {

+		super.updateEntity();

+		if (IC2.platform.isSimulating() && !this.addedToEnergyNet) {

+			MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));

+			this.addedToEnergyNet = true;

+		}

+

+		if (lastFacing != facing) {

 			IC2.network.get().updateTileEntityField(this, "facing");

-			lastFacing=facing;

-        }

-    }

-	

+			lastFacing = facing;

+		}

+	}

 

 	@Override

 	public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {

-		return this.getFacing()!=side;

+		return this.getFacing() != side;

 	}

 

-

 	@Override

 	public short getFacing() {

 		return this.facing;

 	}

 

-

 	@Override

-	public void setFacing(short facing1) 

-	{

-        if (IC2.platform.isSimulating()&&this.addedToEnergyNet)

-        {

-            MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));

-            this.addedToEnergyNet = false;

-        }

-		facing=(short) Math.max(2,facing1);

-		if(IC2.platform.isSimulating())

-		{

+	public void setFacing(short facing1) {

+		if (IC2.platform.isSimulating() && this.addedToEnergyNet) {

+			MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));

+			this.addedToEnergyNet = false;

+		}

+		facing = (short) Math.max(2, facing1);

+		if (IC2.platform.isSimulating()) {

 			IC2.network.get().updateTileEntityField(this, "facing");

-			lastFacing=facing;

+			lastFacing = facing;

+		}

+		if (IC2.platform.isSimulating() && !this.addedToEnergyNet) {

+			MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));

+			this.addedToEnergyNet = true;

 		}

-        if (IC2.platform.isSimulating()&&!this.addedToEnergyNet)

-        {

-            MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));

-            this.addedToEnergyNet = true;

-        }

 	}

 

-

 	@Override

 	public boolean wrenchCanRemove(EntityPlayer entityPlayer) {

 		return true;

 	}

 

-

 	@Override

 	public float getWrenchDropRate() {

 		return 1F;

 	}

 

-

 	@Override

 	public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {

 		return IHLUtils.getThisModItemStack("vulcanizationExtrudingMold");

 	}

-	

+

 	@Override

-	   public void readFromNBT(NBTTagCompound nbttagcompound)

-	    {

-	        super.readFromNBT(nbttagcompound);

-	        this.fluidTank.readFromNBT(nbttagcompound.getCompoundTag("fluidTank"));

-	        facing=nbttagcompound.getShort("facing");

-	        energy=nbttagcompound.getDouble("energy");

-	    }

+	public void readFromNBT(NBTTagCompound nbttagcompound) {

+		super.readFromNBT(nbttagcompound);

+		this.fluidTank.readFromNBT(nbttagcompound.getCompoundTag("fluidTank"));

+		facing = nbttagcompound.getShort("facing");

+		energy = nbttagcompound.getDouble("energy");

+	}

 

 	@Override

-	    public void writeToNBT(NBTTagCompound nbttagcompound)

-	    {

-	        super.writeToNBT(nbttagcompound);

-	        NBTTagCompound fluidTankTag = new NBTTagCompound();

-	        this.fluidTank.writeToNBT(fluidTankTag);

-	        nbttagcompound.setTag("fluidTank", fluidTankTag);

-	        nbttagcompound.setShort("facing", facing);

-	        nbttagcompound.setDouble("energy", this.energy);

-	    }

-	

+	public void writeToNBT(NBTTagCompound nbttagcompound) {

+		super.writeToNBT(nbttagcompound);

+		NBTTagCompound fluidTankTag = new NBTTagCompound();

+		this.fluidTank.writeToNBT(fluidTankTag);

+		nbttagcompound.setTag("fluidTank", fluidTankTag);

+		nbttagcompound.setShort("facing", facing);

+		nbttagcompound.setDouble("energy", this.energy);

+	}

+

 	@Override

-	public double getDemandedEnergy() 

-	{

-			return this.maxStorage-this.energy;

+	public double getDemandedEnergy() {

+		return this.maxStorage - this.energy;

 	}

 

 	@Override

@@ -174,57 +159,52 @@ public class VulcanizationExtrudingMoldTileEntity extends TileEntity implements
 	}

 

 	@Override

-	public double injectEnergy(ForgeDirection directionFrom, double amount,

-			double voltage) {

-			if(this.energy<this.maxStorage)

-			{

-				this.energy+=amount;

-	            return 0.0D;

-			}

-	        else

-	        {

-	            return amount;

-	        }

+	public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) {

+		if (this.energy < this.maxStorage) {

+			this.energy += amount;

+			return 0.0D;

+		} else {

+			return amount;

+		}

 	}

 

 	@Override

-	public boolean acceptsEnergyFrom(TileEntity emitter,

-			ForgeDirection direction) 

-	{

+	public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) {

 		return true;

 	}

 

 	private ItemStack processWire(ItemStack wire, boolean doProcess) {

-		UniversalRecipeOutput rOutput = VulcanizationExtrudingMoldTileEntity.recipeManager.getOutputFor(Arrays.asList(new FluidStack[] {this.fluidTank.getFluid()}),Arrays.asList(new ItemStack[] {wire}), false, false);

-		if(rOutput==null || !(wire.getItem() instanceof FlexibleCableItem) || this.energy<this.energyConsume)

-		{

+		UniversalRecipeOutput rOutput = VulcanizationExtrudingMoldTileEntity.recipeManager.getOutputFor(

+				Arrays.asList(new FluidStack[] { this.fluidTank.getFluid() }), Arrays.asList(new ItemStack[] { wire }),

+				false, false);

+		if (rOutput == null || this.energy < this.energyConsume) {

 			return wire;

 		}

-		UniversalRecipeInput rInput = VulcanizationExtrudingMoldTileEntity.recipeManager.getRecipeInput(Arrays.asList(new FluidStack[] {this.fluidTank.getFluid()}),Arrays.asList(new ItemStack[] {wire}));

+		UniversalRecipeInput rInput = VulcanizationExtrudingMoldTileEntity.recipeManager.getRecipeInput(

+				Arrays.asList(new FluidStack[] { this.fluidTank.getFluid() }), Arrays.asList(new ItemStack[] { wire }));

 		ItemStack cableAsRO = rOutput.getItemOutputs().get(0).itemStack;

 		ItemStack cable = wire.copy();

 		FlexibleCableItem fci = (FlexibleCableItem) cableAsRO.getItem();

 		cable.stackTagCompound.setString("insulationMaterial", fci.getInsulationMaterial(cableAsRO));

 		cable.stackTagCompound.setInteger("insulationThickness", fci.getInsulationThickness(cableAsRO));

-		cable.stackTagCompound.setInteger("maxVoltage", IHLUtils.getInsulationMaxVoltage(fci.getInsulationMaterial(cableAsRO), fci.getInsulationThickness(cableAsRO)));

-		if(doProcess)

-		{

-			this.energy-=this.energyConsume;

-			this.fluidTank.drain(rInput.getFluidInputs().get(0).getAmount()*IHLUtils.getWireLength(cable), true);

+		cable.stackTagCompound.setInteger("maxVoltage", IHLUtils

+				.getInsulationMaxVoltage(fci.getInsulationMaterial(cableAsRO), fci.getInsulationThickness(cableAsRO)));

+		if (doProcess) {

+			this.energy -= this.energyConsume;

+			this.fluidTank.drain(rInput.getFluidInputs().get(0).getAmount() * IHLUtils.getWireLength(cable), true);

 		}

 		return cable;

 	}

-	

+

 	@Override

 	public boolean canProcess(ItemStack wire) {

-		ItemStack cable = this.processWire(wire,false);

+		ItemStack cable = this.processWire(wire, false);

 		ForgeDirection dir = ForgeDirection.getOrientation(getFacing()).getRotation(ForgeDirection.UP);

-		TileEntity te = worldObj.getTileEntity(xCoord+dir.offsetX,yCoord+dir.offsetY,zCoord+dir.offsetZ);

-		if(te instanceof IProductionLine)

-		{

-			if(ForgeDirection.getOrientation(((IProductionLine)te).getFacing()).equals(dir.getRotation(ForgeDirection.DOWN)))

-			{

-				return ((IProductionLine)te).canProcess(cable);

+		TileEntity te = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ);

+		if (te instanceof IProductionLine) {

+			if (ForgeDirection.getOrientation(((IProductionLine) te).getFacing())

+					.equals(dir.getRotation(ForgeDirection.DOWN))) {

+				return ((IProductionLine) te).canProcess(cable);

 			}

 		}

 		return false;

@@ -232,12 +212,12 @@ public class VulcanizationExtrudingMoldTileEntity extends TileEntity implements
 

 	@Override

 	public void process(ItemStack wire) {

-		ItemStack cable = this.processWire(wire,true);

+		ItemStack cable = this.processWire(wire, true);

 		ForgeDirection dir = ForgeDirection.getOrientation(getFacing()).getRotation(ForgeDirection.UP);

-		TileEntity te = worldObj.getTileEntity(xCoord+dir.offsetX,yCoord+dir.offsetY,zCoord+dir.offsetZ);

-		if(te instanceof IProductionLine && ForgeDirection.getOrientation(((IProductionLine)te).getFacing()).equals(dir.getRotation(ForgeDirection.DOWN)))

-		{

-			((IProductionLine)te).process(cable);

+		TileEntity te = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ);

+		if (te instanceof IProductionLine && ForgeDirection.getOrientation(((IProductionLine) te).getFacing())

+				.equals(dir.getRotation(ForgeDirection.DOWN))) {

+			((IProductionLine) te).process(cable);

 		}

 	}

 

@@ -248,7 +228,7 @@ public class VulcanizationExtrudingMoldTileEntity extends TileEntity implements
 

 	@Override

 	public boolean canFill(ForgeDirection arg0, Fluid arg1) {

-		return ForgeDirection.getOrientation(this.facing)==arg0;

+		return ForgeDirection.getOrientation(this.facing) == arg0;

 	}

 

 	@Override

@@ -268,12 +248,10 @@ public class VulcanizationExtrudingMoldTileEntity extends TileEntity implements
 

 	@Override

 	public FluidTankInfo[] getTankInfo(ForgeDirection arg0) {

-		// TODO Auto-generated method stub

-		return null;

+		return new FluidTankInfo[] {this.fluidTank.getInfo()};

 	}

 

-	public static Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipes() 

-	{

+	public static Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipes() {

 		return recipeManager.getRecipes();

 	}

 }

diff --git a/ihl/processing/metallurgy/WoodenRollingMachinePart1TileEntity.java b/ihl/processing/metallurgy/WoodenRollingMachinePart1TileEntity.java
index 31b6386..5c786c5 100644
--- a/ihl/processing/metallurgy/WoodenRollingMachinePart1TileEntity.java
+++ b/ihl/processing/metallurgy/WoodenRollingMachinePart1TileEntity.java
@@ -4,6 +4,8 @@ import java.util.List;
 import java.util.Map;

 

 import ic2.api.recipe.IRecipeInput;

+import ic2.api.recipe.RecipeInputItemStack;

+import ic2.api.recipe.RecipeInputOreDict;

 import ic2.core.ContainerBase;

 import ic2.core.IC2;

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

@@ -132,9 +134,9 @@ public class WoodenRollingMachinePart1TileEntity extends BasicElectricMotorTileE
 	@Override

 	public void onGuiClosed(EntityPlayer arg0) {}

 	

-	public static void addRecipe(ItemStack input, ItemStack input2, ItemStack input3, ItemStack output) 

+	public static void addRecipe(RecipeInputItemStack recipeInputItemStack, RecipeInputItemStack recipeInputItemStack2, RecipeInputOreDict recipeInputOreDict, ItemStack output) 

 	{

-		recipeManager.addRecipe(new UniversalRecipeInput(null, (new ItemStack[] {input,input2,input3})), new UniversalRecipeOutput(null,(new ItemStack[] {output}),20));

+		recipeManager.addRecipe(new UniversalRecipeInput(null, (new IRecipeInput[] {recipeInputItemStack,recipeInputItemStack2,recipeInputOreDict})), new UniversalRecipeOutput(null,(new ItemStack[] {output}),20));

 	}

 	

 

@@ -142,9 +144,9 @@ public class WoodenRollingMachinePart1TileEntity extends BasicElectricMotorTileE
 		return recipeManager.getRecipes();

 	}

 

-	public static void addRecipe(ItemStack input, ItemStack input3, ItemStack output) 

+	public static void addRecipe(RecipeInputOreDict recipeInputOreDict, RecipeInputOreDict recipeInputOreDict2, ItemStack output) 

 	{

-		recipeManager.addRecipe(new UniversalRecipeInput(null, (new ItemStack[] {input,input3})), new UniversalRecipeOutput(null,(new ItemStack[] {output}),20));

+		recipeManager.addRecipe(new UniversalRecipeInput(null, (new IRecipeInput[] {recipeInputOreDict,recipeInputOreDict2})), new UniversalRecipeOutput(null,(new ItemStack[] {output}),20));

 	}

 

 	@Override