Reformat code

19 files changed, 909 insertions, 1022 deletions

diff --git a/src/main/java/gregtech/common/gui/GT_Container_Boiler.java b/src/main/java/gregtech/common/gui/GT_Container_Boiler.java
index 7ab8cc0f95..4a74a43fca 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Boiler.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Boiler.java
@@ -5,87 +5,79 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;

-import java.util.Iterator;

-import java.util.List;

 import net.minecraft.entity.player.InventoryPlayer;

 import net.minecraft.inventory.ICrafting;

 import net.minecraft.inventory.Slot;

-import net.minecraftforge.fluids.FluidStack;

+

+import java.util.Iterator;

 

 public class GT_Container_Boiler

-  extends GT_ContainerMetaTile_Machine

-{

-  public GT_Container_Boiler(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, int aSteamCapacity)

-  {

-    super(aInventoryPlayer, aTileEntity);

-    this.mSteamCapacity = aSteamCapacity;

-  }

-  

-  public void addSlots(InventoryPlayer aInventoryPlayer)

-  {

-    addSlotToContainer(new Slot(this.mTileEntity, 2, 116, 62));

-    addSlotToContainer(new Slot(this.mTileEntity, 0, 44, 26));

-    addSlotToContainer(new Slot(this.mTileEntity, 1, 44, 62));

-    addSlotToContainer(new Slot(this.mTileEntity, 3, 116, 26));

-  }

-  

-  public int getSlotCount()

-  {

-    return 4;

-  }

-  

-  public int getShiftClickSlotCount()

-  {

-    return 1;

-  }

-  

-  public int mWaterAmount = 0;

-  public int mSteamAmount = 0;

-  public int mProcessingEnergy = 0;

-  public int mTemperature = 2;

-  private final int mSteamCapacity;

-  

-  public void detectAndSendChanges()

-  {

-    super.detectAndSendChanges();

-    if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {

-      return;

+        extends GT_ContainerMetaTile_Machine {

+    private final int mSteamCapacity;

+    public int mWaterAmount = 0;

+    public int mSteamAmount = 0;

+    public int mProcessingEnergy = 0;

+    public int mTemperature = 2;

+    public GT_Container_Boiler(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, int aSteamCapacity) {

+        super(aInventoryPlayer, aTileEntity);

+        this.mSteamCapacity = aSteamCapacity;

     }

-    this.mTemperature = ((GT_MetaTileEntity_Boiler)this.mTileEntity.getMetaTileEntity()).mTemperature;

-    this.mProcessingEnergy = ((GT_MetaTileEntity_Boiler)this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;

-    this.mSteamAmount = (((GT_MetaTileEntity_Boiler)this.mTileEntity.getMetaTileEntity()).mSteam == null ? 0 : ((GT_MetaTileEntity_Boiler)this.mTileEntity.getMetaTileEntity()).mSteam.amount);

-    this.mWaterAmount = (((GT_MetaTileEntity_Boiler)this.mTileEntity.getMetaTileEntity()).mFluid == null ? 0 : ((GT_MetaTileEntity_Boiler)this.mTileEntity.getMetaTileEntity()).mFluid.amount);

-    

-    this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54 / (((GT_MetaTileEntity_Boiler)this.mTileEntity.getMetaTileEntity()).maxProgresstime() - 10)));

-    this.mSteamAmount = Math.min(54, Math.max(0, this.mSteamAmount * 54 / (this.mSteamCapacity - 100)));

-    this.mWaterAmount = Math.min(54, Math.max(0, this.mWaterAmount * 54 / 15900));

-    this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000));

-    

-    Iterator var2 = this.crafters.iterator();

-    while (var2.hasNext())

-    {

-      ICrafting var1 = (ICrafting)var2.next();

-      var1.sendProgressBarUpdate(this, 100, this.mTemperature);

-      var1.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);

-      var1.sendProgressBarUpdate(this, 102, this.mSteamAmount);

-      var1.sendProgressBarUpdate(this, 103, this.mWaterAmount);

+

+    public void addSlots(InventoryPlayer aInventoryPlayer) {

+        addSlotToContainer(new Slot(this.mTileEntity, 2, 116, 62));

+        addSlotToContainer(new Slot(this.mTileEntity, 0, 44, 26));

+        addSlotToContainer(new Slot(this.mTileEntity, 1, 44, 62));

+        addSlotToContainer(new Slot(this.mTileEntity, 3, 116, 26));

     }

-  }

-  

-  @SideOnly(Side.CLIENT)

-  public void updateProgressBar(int par1, int par2)

-  {

-    super.updateProgressBar(par1, par2);

-    switch (par1)

-    {

-    case 100: 

-      this.mTemperature = par2; break;

-    case 101: 

-      this.mProcessingEnergy = par2; break;

-    case 102: 

-      this.mSteamAmount = par2; break;

-    case 103: 

-      this.mWaterAmount = par2;

+

+    public int getSlotCount() {

+        return 4;

+    }

+

+    public int getShiftClickSlotCount() {

+        return 1;

+    }

+

+    public void detectAndSendChanges() {

+        super.detectAndSendChanges();

+        if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {

+            return;

+        }

+        this.mTemperature = ((GT_MetaTileEntity_Boiler) this.mTileEntity.getMetaTileEntity()).mTemperature;

+        this.mProcessingEnergy = ((GT_MetaTileEntity_Boiler) this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;

+        this.mSteamAmount = (((GT_MetaTileEntity_Boiler) this.mTileEntity.getMetaTileEntity()).mSteam == null ? 0 : ((GT_MetaTileEntity_Boiler) this.mTileEntity.getMetaTileEntity()).mSteam.amount);

+        this.mWaterAmount = (((GT_MetaTileEntity_Boiler) this.mTileEntity.getMetaTileEntity()).mFluid == null ? 0 : ((GT_MetaTileEntity_Boiler) this.mTileEntity.getMetaTileEntity()).mFluid.amount);

+

+        this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54 / (((GT_MetaTileEntity_Boiler) this.mTileEntity.getMetaTileEntity()).maxProgresstime() - 10)));

+        this.mSteamAmount = Math.min(54, Math.max(0, this.mSteamAmount * 54 / (this.mSteamCapacity - 100)));

+        this.mWaterAmount = Math.min(54, Math.max(0, this.mWaterAmount * 54 / 15900));

+        this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000));

+

+        Iterator var2 = this.crafters.iterator();

+        while (var2.hasNext()) {

+            ICrafting var1 = (ICrafting) var2.next();

+            var1.sendProgressBarUpdate(this, 100, this.mTemperature);

+            var1.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);

+            var1.sendProgressBarUpdate(this, 102, this.mSteamAmount);

+            var1.sendProgressBarUpdate(this, 103, this.mWaterAmount);

+        }

+    }

+

+    @SideOnly(Side.CLIENT)

+    public void updateProgressBar(int par1, int par2) {

+        super.updateProgressBar(par1, par2);

+        switch (par1) {

+            case 100:

+                this.mTemperature = par2;

+                break;

+            case 101:

+                this.mProcessingEnergy = par2;

+                break;

+            case 102:

+                this.mSteamAmount = par2;

+                break;

+            case 103:

+                this.mWaterAmount = par2;

+        }

     }

-  }

 }

diff --git a/src/main/java/gregtech/common/gui/GT_Container_BronzeBlastFurnace.java b/src/main/java/gregtech/common/gui/GT_Container_BronzeBlastFurnace.java
index 7dc97e0989..8050755b87 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_BronzeBlastFurnace.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_BronzeBlastFurnace.java
@@ -7,28 +7,23 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;

 

 public class GT_Container_BronzeBlastFurnace

-  extends GT_ContainerMetaTile_Machine

-{

-  public GT_Container_BronzeBlastFurnace(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity)

-  {

-    super(aInventoryPlayer, aTileEntity);

-  }

-  

-  public void addSlots(InventoryPlayer aInventoryPlayer)

-  {

-    addSlotToContainer(new Slot(this.mTileEntity, 0, 34, 16));

-    addSlotToContainer(new Slot(this.mTileEntity, 1, 34, 34));

-    addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 2, 86, 25));

-    addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 3, 104, 25));

-  }

-  

-  public int getSlotCount()

-  {

-    return 4;

-  }

-  

-  public int getShiftClickSlotCount()

-  {

-    return 2;

-  }

+        extends GT_ContainerMetaTile_Machine {

+    public GT_Container_BronzeBlastFurnace(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {

+        super(aInventoryPlayer, aTileEntity);

+    }

+

+    public void addSlots(InventoryPlayer aInventoryPlayer) {

+        addSlotToContainer(new Slot(this.mTileEntity, 0, 34, 16));

+        addSlotToContainer(new Slot(this.mTileEntity, 1, 34, 34));

+        addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 2, 86, 25));

+        addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 3, 104, 25));

+    }

+

+    public int getSlotCount() {

+        return 4;

+    }

+

+    public int getShiftClickSlotCount() {

+        return 2;

+    }

 }

diff --git a/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java b/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
index f2fd7848b6..8cd6e9db54 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
@@ -5,84 +5,73 @@ import gregtech.api.gui.GT_Slot_Holo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.util.GT_Utility;

 import gregtech.common.tileentities.automation.GT_MetaTileEntity_ChestBuffer;

-import java.util.List;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.entity.player.InventoryPlayer;

 import net.minecraft.inventory.Slot;

 import net.minecraft.item.ItemStack;

 

 public class GT_Container_ChestBuffer

-  extends GT_ContainerMetaTile_Machine

-{

-  public GT_Container_ChestBuffer(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity)

-  {

-    super(aInventoryPlayer, aTileEntity);

-  }

-  

-  public void addSlots(InventoryPlayer aInventoryPlayer)

-  {

-    for (int y = 0; y < 3; y++) {

-      for (int x = 0; x < 9; x++) {

-        addSlotToContainer(new Slot(this.mTileEntity, x + y * 9, 8 + x * 18, 5 + y * 18));

-      }

+        extends GT_ContainerMetaTile_Machine {

+    public GT_Container_ChestBuffer(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {

+        super(aInventoryPlayer, aTileEntity);

     }

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 8, 63, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 26, 63, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 44, 63, false, true, 1));

-  }

-  

-  public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer)

-  {

-    if (aSlotIndex < 27) {

-      return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);

-    }

-    Slot tSlot = (Slot)this.inventorySlots.get(aSlotIndex);

-    if (tSlot != null)

-    {

-      if (this.mTileEntity.getMetaTileEntity() == null) {

-        return null;

-      }

-      if (aSlotIndex == 27)

-      {

-        ((GT_MetaTileEntity_ChestBuffer)this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_ChestBuffer)this.mTileEntity.getMetaTileEntity()).bOutput);

-        if (((GT_MetaTileEntity_ChestBuffer)this.mTileEntity.getMetaTileEntity()).bOutput) {

-          GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");

-        } else {

-          GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");

+

+    public void addSlots(InventoryPlayer aInventoryPlayer) {

+        for (int y = 0; y < 3; y++) {

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

+                addSlotToContainer(new Slot(this.mTileEntity, x + y * 9, 8 + x * 18, 5 + y * 18));

+            }

         }

-        return null;

-      }

-      if (aSlotIndex == 28)

-      {

-        ((GT_MetaTileEntity_ChestBuffer)this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_ChestBuffer)this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);

-        if (((GT_MetaTileEntity_ChestBuffer)this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {

-          GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if no Slot is free");

-        } else {

-          GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 8, 63, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 26, 63, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 44, 63, false, true, 1));

+    }

+

+    public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {

+        if (aSlotIndex < 27) {

+            return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);

         }

-        return null;

-      }

-      if (aSlotIndex == 29)

-      {

-        ((GT_MetaTileEntity_ChestBuffer)this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_ChestBuffer)this.mTileEntity.getMetaTileEntity()).bInvert);

-        if (((GT_MetaTileEntity_ChestBuffer)this.mTileEntity.getMetaTileEntity()).bInvert) {

-          GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");

-        } else {

-          GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");

+        Slot tSlot = (Slot) this.inventorySlots.get(aSlotIndex);

+        if (tSlot != null) {

+            if (this.mTileEntity.getMetaTileEntity() == null) {

+                return null;

+            }

+            if (aSlotIndex == 27) {

+                ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput);

+                if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput) {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");

+                } else {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");

+                }

+                return null;

+            }

+            if (aSlotIndex == 28) {

+                ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);

+                if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if no Slot is free");

+                } else {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");

+                }

+                return null;

+            }

+            if (aSlotIndex == 29) {

+                ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert);

+                if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert) {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");

+                } else {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");

+                }

+                return null;

+            }

         }

-        return null;

-      }

+        return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);

+    }

+

+    public int getSlotCount() {

+        return 27;

+    }

+

+    public int getShiftClickSlotCount() {

+        return 27;

     }

-    return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);

-  }

-  

-  public int getSlotCount()

-  {

-    return 27;

-  }

-  

-  public int getShiftClickSlotCount()

-  {

-    return 27;

-  }

 }

diff --git a/src/main/java/gregtech/common/gui/GT_Container_Filter.java b/src/main/java/gregtech/common/gui/GT_Container_Filter.java
index ac468a444b..8239f8a96a 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Filter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Filter.java
@@ -5,139 +5,122 @@ import gregtech.api.gui.GT_Slot_Holo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.util.GT_Utility;

 import gregtech.common.tileentities.automation.GT_MetaTileEntity_Filter;

-import java.util.List;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.entity.player.InventoryPlayer;

 import net.minecraft.inventory.Slot;

 import net.minecraft.item.ItemStack;

 

 public class GT_Container_Filter

-  extends GT_ContainerMetaTile_Machine

-{

-  public GT_Container_Filter(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity)

-  {

-    super(aInventoryPlayer, aTileEntity);

-  }

-  

-  public void addSlots(InventoryPlayer aInventoryPlayer)

-  {

-    addSlotToContainer(new Slot(this.mTileEntity, 0, 98, 5));

-    addSlotToContainer(new Slot(this.mTileEntity, 1, 116, 5));

-    addSlotToContainer(new Slot(this.mTileEntity, 2, 134, 5));

-    addSlotToContainer(new Slot(this.mTileEntity, 3, 98, 23));

-    addSlotToContainer(new Slot(this.mTileEntity, 4, 116, 23));

-    addSlotToContainer(new Slot(this.mTileEntity, 5, 134, 23));

-    addSlotToContainer(new Slot(this.mTileEntity, 6, 98, 41));

-    addSlotToContainer(new Slot(this.mTileEntity, 7, 116, 41));

-    addSlotToContainer(new Slot(this.mTileEntity, 8, 134, 41));

-    

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 9, 18, 6, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 10, 35, 6, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 11, 52, 6, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 12, 18, 23, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 13, 35, 23, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 14, 52, 23, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 15, 18, 40, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 16, 35, 40, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 17, 52, 40, false, true, 1));

-    

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 8, 63, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 26, 63, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 44, 63, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 62, 63, false, true, 1));

-    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 80, 63, false, true, 1));

-  }

-  

-  public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer)

-  {

-    if (aSlotIndex < 9) {

-      return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);

+        extends GT_ContainerMetaTile_Machine {

+    public GT_Container_Filter(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {

+        super(aInventoryPlayer, aTileEntity);

     }

-    Slot tSlot = (Slot)this.inventorySlots.get(aSlotIndex);

-    if (tSlot != null)

-    {

-      if (this.mTileEntity.getMetaTileEntity() == null) {

-        return null;

-      }

-      if (aSlotIndex < 18)

-      {

-        ItemStack tStack = aPlayer.inventory.getItemStack();

-        if (tStack == null)

-        {

-          tStack = tSlot.getStack();

-          if (aMouseclick == 0) {

-            tSlot.putStack(null);

-          } else if (tStack != null) {

-            tStack.setItemDamage(32767);

-          }

-        }

-        else

-        {

-          tSlot.putStack(GT_Utility.copyAmount(1L, new Object[] { tStack }));

-        }

-        return null;

-      }

-      if (aSlotIndex == 18)

-      {

-        ((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bOutput);

-        if (((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bOutput) {

-          GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");

-        } else {

-          GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");

-        }

-        return null;

-      }

-      if (aSlotIndex == 19)

-      {

-        ((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);

-        if (((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {

-          GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if slots contain something");

-        } else {

-          GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");

-        }

-        return null;

-      }

-      if (aSlotIndex == 20)

-      {

-        ((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bInvert);

-        if (((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bInvert) {

-          GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");

-        } else {

-          GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");

-        }

-        return null;

-      }

-      if (aSlotIndex == 21)

-      {

-        ((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bInvertFilter = (!((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bInvertFilter);

-        if (((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bInvertFilter) {

-          GT_Utility.sendChatToPlayer(aPlayer, "Invert Filter");

-        } else {

-          GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Filter");

+

+    public void addSlots(InventoryPlayer aInventoryPlayer) {

+        addSlotToContainer(new Slot(this.mTileEntity, 0, 98, 5));

+        addSlotToContainer(new Slot(this.mTileEntity, 1, 116, 5));

+        addSlotToContainer(new Slot(this.mTileEntity, 2, 134, 5));

+        addSlotToContainer(new Slot(this.mTileEntity, 3, 98, 23));

+        addSlotToContainer(new Slot(this.mTileEntity, 4, 116, 23));

+        addSlotToContainer(new Slot(this.mTileEntity, 5, 134, 23));

+        addSlotToContainer(new Slot(this.mTileEntity, 6, 98, 41));

+        addSlotToContainer(new Slot(this.mTileEntity, 7, 116, 41));

+        addSlotToContainer(new Slot(this.mTileEntity, 8, 134, 41));

+

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 9, 18, 6, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 10, 35, 6, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 11, 52, 6, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 12, 18, 23, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 13, 35, 23, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 14, 52, 23, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 15, 18, 40, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 16, 35, 40, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 17, 52, 40, false, true, 1));

+

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 8, 63, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 26, 63, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 44, 63, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 62, 63, false, true, 1));

+        addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 80, 63, false, true, 1));

+    }

+

+    public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {

+        if (aSlotIndex < 9) {

+            return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);

         }

-        return null;

-      }

-      if (aSlotIndex == 22)

-      {

-        ((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bIgnoreNBT = (!((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bIgnoreNBT);

-        if (((GT_MetaTileEntity_Filter)this.mTileEntity.getMetaTileEntity()).bIgnoreNBT) {

-          GT_Utility.sendChatToPlayer(aPlayer, "Ignore NBT");

-        } else {

-          GT_Utility.sendChatToPlayer(aPlayer, "NBT has to match");

+        Slot tSlot = (Slot) this.inventorySlots.get(aSlotIndex);

+        if (tSlot != null) {

+            if (this.mTileEntity.getMetaTileEntity() == null) {

+                return null;

+            }

+            if (aSlotIndex < 18) {

+                ItemStack tStack = aPlayer.inventory.getItemStack();

+                if (tStack == null) {

+                    tStack = tSlot.getStack();

+                    if (aMouseclick == 0) {

+                        tSlot.putStack(null);

+                    } else if (tStack != null) {

+                        tStack.setItemDamage(32767);

+                    }

+                } else {

+                    tSlot.putStack(GT_Utility.copyAmount(1L, new Object[]{tStack}));

+                }

+                return null;

+            }

+            if (aSlotIndex == 18) {

+                ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bOutput);

+                if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bOutput) {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");

+                } else {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");

+                }

+                return null;

+            }

+            if (aSlotIndex == 19) {

+                ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);

+                if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if slots contain something");

+                } else {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");

+                }

+                return null;

+            }

+            if (aSlotIndex == 20) {

+                ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvert);

+                if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvert) {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");

+                } else {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");

+                }

+                return null;

+            }

+            if (aSlotIndex == 21) {

+                ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvertFilter = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvertFilter);

+                if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvertFilter) {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Filter");

+                } else {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Filter");

+                }

+                return null;

+            }

+            if (aSlotIndex == 22) {

+                ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bIgnoreNBT = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bIgnoreNBT);

+                if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bIgnoreNBT) {

+                    GT_Utility.sendChatToPlayer(aPlayer, "Ignore NBT");

+                } else {

+                    GT_Utility.sendChatToPlayer(aPlayer, "NBT has to match");

+                }

+                return null;

+            }

         }

-        return null;

-      }

+        return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);

+    }

+

+    public int getSlotCount() {

+        return 9;

+    }

+

+    public int getShiftClickSlotCount() {

+        return 9;

     }

-    return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);

-  }

-  

-  public int getSlotCount()

-  {

-    return 9;

-  }

-  

-  public int getShiftClickSlotCount()

-  {

-    return 9;

-  }

 }

diff --git a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
index 01c0a95346..d8b2cbe695 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
@@ -1,69 +1,73 @@
 package gregtech.common.gui;
 
-import java.util.Iterator;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.inventory.Slot;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Output;
 import gregtech.api.gui.GT_Slot_Render;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+
+import java.util.Iterator;
+
+public class GT_Container_QuantumChest extends GT_ContainerMetaTile_Machine {
 
-public class GT_Container_QuantumChest extends GT_ContainerMetaTile_Machine  {
+    public int mContent = 0;
+
+    public GT_Container_QuantumChest(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
 
-	public GT_Container_QuantumChest(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
-		super(aInventoryPlayer, aTileEntity);
-	}
-	
     @Override
-	public void addSlots(InventoryPlayer aInventoryPlayer) {
-        addSlotToContainer(new Slot(mTileEntity, 0,  80,  17));
-        addSlotToContainer(new GT_Slot_Output(mTileEntity, 1,  80,  53));
-        addSlotToContainer(new GT_Slot_Render(mTileEntity, 2,  59,  42));
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new Slot(mTileEntity, 0, 80, 17));
+        addSlotToContainer(new GT_Slot_Output(mTileEntity, 1, 80, 53));
+        addSlotToContainer(new GT_Slot_Render(mTileEntity, 2, 59, 42));
     }
-    
-    public int mContent = 0;
-    
+
     @Override
-	public void detectAndSendChanges() {
+    public void detectAndSendChanges() {
         super.detectAndSendChanges();
-        
-    	if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
-    	if (mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_QuantumChest){
-    		mContent = ((GT_MetaTileEntity_QuantumChest)mTileEntity.getMetaTileEntity()).mItemCount;
-    	}else{
-    		mContent = 0;}
-    	
+
+        if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
+        if (mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_QuantumChest) {
+            mContent = ((GT_MetaTileEntity_QuantumChest) mTileEntity.getMetaTileEntity()).mItemCount;
+        } else {
+            mContent = 0;