From aa42aedecd2d2842351088085e8fd9d69ec79565 Mon Sep 17 00:00:00 2001
From: Foghrye4 <foghrye4@gmail.com>
Date: Fri, 14 Apr 2017 07:58:16 +0300
Subject: Colourful lights

---
 .../chemistry/PaperMachineContainer.java           | 70 ++--------------------
 1 file changed, 4 insertions(+), 66 deletions(-)

(limited to 'ihl/processing/chemistry/PaperMachineContainer.java')

diff --git a/ihl/processing/chemistry/PaperMachineContainer.java b/ihl/processing/chemistry/PaperMachineContainer.java
index ea07afc..0969649 100644
--- a/ihl/processing/chemistry/PaperMachineContainer.java
+++ b/ihl/processing/chemistry/PaperMachineContainer.java
@@ -10,7 +10,7 @@ import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
 import net.minecraftforge.fluids.FluidStack;
 
-public class PaperMachineContainer extends ContainerBase<PaperMachineTileEntity> {
+public class PaperMachineContainer extends BasicElectricMotorContainer<PaperMachineTileEntity> {
 
     protected PaperMachineTileEntity tileEntity;
     public int lastFluidAmount = -1;
@@ -18,89 +18,27 @@ public class PaperMachineContainer extends ContainerBase<PaperMachineTileEntity>
     public short lastProgress = -1;
     public short lastTemperature = -1;
     public short lastEnergy = -1;
-    private final static int height=166;
     public List<FluidStack> fluidTankFluidList;
     
     public PaperMachineContainer(EntityPlayer entityPlayer, PaperMachineTileEntity tileEntity1){
-        super(tileEntity1);
+        super(entityPlayer, tileEntity1);
         this.tileEntity = tileEntity1;
         fluidTankFluidList=this.tileEntity.getFluidTank().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.fillInputSlot, 0, 78, 51));
             this.addSlotToContainer(new SlotInvSlot(tileEntity1.drainInputSlot, 0, 78, 15));
             this.addSlotToContainer(new SlotInvSlot(tileEntity1.emptyFluidItemsSlot, 0, 78, 33));
             this.addSlotToContainer(new SlotInvSlot(tileEntity1.outputSlot, 0, 122, 51));
-            this.addSlotToContainer(new SlotInvSlot(tileEntity1.dischargeSlot, 0, 8, 32));
     }
 
     @Override
 	public void detectAndSendChanges()
     {
         super.detectAndSendChanges();
-        for (int i = 0; i < this.crafters.size(); ++i)
+        if (this.tileEntity.getTankAmount() != this.lastFluidAmount || this.tileEntity.getNumberOfFluidsInTank() != this.lastNumberOfFluids)
         {
-            ICrafting icrafting = (ICrafting)this.crafters.get(i);
-
-            if (this.tileEntity.getTankAmount() != this.lastFluidAmount || this.tileEntity.getNumberOfFluidsInTank() != this.lastNumberOfFluids)
-            {
-                IC2.network.get().sendContainerField(this, "fluidTankFluidList");
-            }
-            
-            if (this.tileEntity.progress != this.lastProgress)
-            {
-                icrafting.sendProgressBarUpdate(this, 0, this.tileEntity.progress);
-            }
-            
-            if (this.tileEntity.temperature != this.lastTemperature)
-            {
-                icrafting.sendProgressBarUpdate(this, 1, this.tileEntity.temperature);
-            }
-            
-            
-            if ((short) this.tileEntity.energy != this.lastEnergy)
-            {
-                icrafting.sendProgressBarUpdate(this, 2, (short) this.tileEntity.energy);
-            }
+            IC2.network.get().sendContainerField(this, "fluidTankFluidList");
         }
-
         this.lastNumberOfFluids = this.tileEntity.getNumberOfFluidsInTank();
         this.lastFluidAmount = this.tileEntity.getTankAmount();
-        this.lastProgress = this.tileEntity.progress;
-        this.lastTemperature = this.tileEntity.temperature;
-        this.lastEnergy = (short) this.tileEntity.energy;
     }
-    
-    @Override
-	public void updateProgressBar(int index, int value)
-    {
-        super.updateProgressBar(index, value);
-        switch (index)
-        {
-            case 0:
-                this.tileEntity.progress=(short) value;
-                break;
-            case 1:
-                this.tileEntity.temperature=(short) value;
-                break;
-            case 2:
-                this.tileEntity.energy=value;
-                break;
-        }
-    }
-    
-	@Override
-	public boolean canInteractWith(EntityPlayer var1) {
-		return tileEntity.isUseableByPlayer(var1);
-	}
 }
-- 
cgit v1.2.3