Oregen

1 files changed, 77 insertions, 62 deletions

diff --git a/ihl/processing/chemistry/LeadOvenContainer.java b/ihl/processing/chemistry/LeadOvenContainer.java
index c273623..2f0ff8a 100644
--- a/ihl/processing/chemistry/LeadOvenContainer.java
+++ b/ihl/processing/chemistry/LeadOvenContainer.java
@@ -1,78 +1,93 @@
 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 LeadOvenContainer extends ContainerBase<LeadOvenTileEntity> {

 

-    protected LeadOvenTileEntity tileEntity;

-    public int lastFluidAmount = -1;

-    public int lastFuel = -1;

-    public short lastProgress = -1;

-    private final static int height=166;

-    

-    public LeadOvenContainer(EntityPlayer entityPlayer, LeadOvenTileEntity 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.fuelSlot, 0, 56, 53));

-        this.addSlotToContainer(new SlotInvSlot(tileEntity1.inputSlot, 0, 47, 17));

-        this.addSlotToContainer(new SlotInvSlot(tileEntity1.inputSlot, 1, 65, 17));

-        this.addSlotToContainer(new SlotInvSlot(tileEntity1.outputSlot, 0, 112, 35));

-    }

+	protected LeadOvenTileEntity tileEntity;

+	public int lastInputFluidAmount = -1;

+	public int lastOutputFluidAmount = -1;

+	public int lastFuel = -1;

+	public short lastProgress = -1;

+	private final static int height = 166;

+	public List<FluidStack> inputTankFluidList;

+	public List<FluidStack> outputTankFluidList;

+

+	public LeadOvenContainer(EntityPlayer entityPlayer, LeadOvenTileEntity tileEntity1) {

+		super(tileEntity1);

+		this.tileEntity = tileEntity1;

+		inputTankFluidList = this.tileEntity.inputTank.getFluidList();

+		outputTankFluidList = this.tileEntity.outputTank.getFluidList();

+		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.fuelSlot, 0, 56, 53));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.inputSlot, 0, 47, 17));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.inputSlot, 1, 65, 17));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.outputSlot, 0, 112, 35));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.fillInputSlot, 0, 9, 53));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.drainInputSlot, 0, 9, 17));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.emptyFluidItemsSlot, 0, 9, 35));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.fillInputSlot2, 0, 150, 53));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.drainInputSlot2, 0, 150, 17));

+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.emptyFluidItemsSlot, 1, 150, 35));

+	}

+

+	@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.inputTank.getFluidAmount() != this.lastInputFluidAmount) {

+				IC2.network.get().sendContainerField(this, "inputTankFluidList");

+			}

+			if (this.tileEntity.outputTank.getFluidAmount() != this.lastOutputFluidAmount) {

+				IC2.network.get().sendContainerField(this, "outputTankFluidList");

+			}

+

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

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

+			}

 

-    @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.progress != this.lastProgress) {

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

+			}

+		}

+		this.lastFuel = this.tileEntity.fuel;

+		this.lastProgress = this.tileEntity.progress;

+		this.lastInputFluidAmount = this.tileEntity.inputTank.getFluidAmount();

+		this.lastOutputFluidAmount = this.tileEntity.outputTank.getFluidAmount();

+	}

 

-            if (this.tileEntity.fuel != this.lastFuel)

-            {

-                icrafting.sendProgressBarUpdate(this, 0, this.tileEntity.fuel);

-            }

-            

-            if (this.tileEntity.progress != this.lastProgress)

-            {

-                icrafting.sendProgressBarUpdate(this, 1, this.tileEntity.progress);

-            }

-        }

-        this.lastFuel = this.tileEntity.fuel;

-        this.lastProgress = this.tileEntity.progress;

-    }

-    

-    @Override

-	public void updateProgressBar(int index, int value)

-    {

-        super.updateProgressBar(index, value);

+	@Override

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

+		super.updateProgressBar(index, value);

+

+		switch (index) {

+		case 0:

+			this.tileEntity.fuel = value;

+			break;

+		case 1:

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

+			break;

+		}

+	}

 

-        switch (index)

-        {

-            case 0:

-                this.tileEntity.fuel=value;

-                break;

-            case 1:

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

-                break;

-        }

-    }

-    

 	@Override

 	public boolean canInteractWith(EntityPlayer var1) {

 		return tileEntity.isUseableByPlayer(var1);