Merge pull request #249 from ShawnBuckley/source-move

Move source directory

19 files changed, 1318 insertions, 0 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
new file mode 100644
index 0000000000..7ab8cc0f95
--- /dev/null
+++ b/src/main/java/gregtech/common/gui/GT_Container_Boiler.java
@@ -0,0 +1,91 @@
+package gregtech.common.gui;

+

+import cpw.mods.fml.relauncher.Side;

+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;

+

+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;

+    }

+    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
new file mode 100644
index 0000000000..7dc97e0989
--- /dev/null
+++ b/src/main/java/gregtech/common/gui/GT_Container_BronzeBlastFurnace.java
@@ -0,0 +1,34 @@
+package gregtech.common.gui;

+

+import gregtech.api.gui.GT_ContainerMetaTile_Machine;

+import gregtech.api.gui.GT_Slot_Output;

+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+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;

+  }

+}

diff --git a/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java b/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
new file mode 100644
index 0000000000..f2fd7848b6
--- /dev/null
+++ b/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
@@ -0,0 +1,88 @@
+package gregtech.common.gui;

+

+import gregtech.api.gui.GT_ContainerMetaTile_Machine;

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

+      }

+    }

+    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");

+        }

+        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 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
new file mode 100644
index 0000000000..ac468a444b
--- /dev/null
+++ b/src/main/java/gregtech/common/gui/GT_Container_Filter.java
@@ -0,0 +1,143 @@
+package gregtech.common.gui;

+

+import gregtech.api.gui.GT_ContainerMetaTile_Machine;

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

+    }

+    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 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
new file mode 100644
index 0000000000..01c0a95346
--- /dev/null
+++ b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
@@ -0,0 +1,69 @@
+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;
+
+public class GT_Container_QuantumChest extends GT_ContainerMetaTile_Machine  {
+
+	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 int mContent = 0;
+    
+    @Override
+	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;}
+    	
+        Iterator var2 = this.crafters.iterator();
+        while (var2.hasNext()) {
+            ICrafting var1 = (ICrafting)var2.next();
+            var1.sendProgressBarUpdate(this, 100, mContent & 65535);
+            var1.sendProgressBarUpdate(this, 101, mContent >>> 16);
+        }
+    }
+    
+    @Override
+	@SideOnly(Side.CLIENT)
+    public void updateProgressBar(int par1, int par2) {
+    	super.updateProgressBar(par1, par2);
+    	switch (par1) {
+    	case 100: mContent = mContent & -65536 | par2; break;
+    	case 101: mContent = mContent &  65535 | par2 << 16; break;
+    	}
+    }
+    
+    @Override
+	public int getSlotCount() {
+    	return 2;
+    }
+
+    @Override
+	public int getShiftClickSlotCount() {
+    	return 1;
+    }
+}
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
new file mode 100644
index 0000000000..5fab86818e
--- /dev/null
+++ b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
@@ -0,0 +1,174 @@
+package gregtech.common.gui;

+

+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_Holo;

+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import gregtech.api.util.GT_Utility;

+import gregtech.common.tileentities.automation.GT_MetaTileEntity_Regulator;

+import java.util.Iterator;

+import java.util.List;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.entity.player.InventoryPlayer;

+import net.minecraft.inventory.ICrafting;

+import net.minecraft.inventory.Slot;

+import net.minecraft.item.ItemStack;

+

+public class GT_Container_Regulator

+  extends GT_ContainerMetaTile_Machine

+{

+  public GT_Container_Regulator(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity)

+  {

+    super(aInventoryPlayer, aTileEntity);

+  }

+  

+  public void addSlots(InventoryPlayer aInventoryPlayer)

+  {

+    this.mTargetSlots = new int[] { 0, 0, 0, 0, 0, 0, 0, 0, 0 };

+    

+    addSlotToContainer(new Slot(this.mTileEntity, 0, 8, 6));

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

+    addSlotToContainer(new Slot(this.mTileEntity, 2, 44, 6));

+    addSlotToContainer(new Slot(this.mTileEntity, 3, 8, 24));

+    addSlotToContainer(new Slot(this.mTileEntity, 4, 26, 24));

+    addSlotToContainer(new Slot(this.mTileEntity, 5, 44, 24));

+    addSlotToContainer(new Slot(this.mTileEntity, 6, 8, 42));

+    addSlotToContainer(new Slot(this.mTileEntity, 7, 26, 42));

+    addSlotToContainer(new Slot(this.mTileEntity, 8, 44, 42));

+    

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 9, 64, 7, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 10, 81, 7, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 11, 98, 7, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 12, 64, 24, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 13, 81, 24, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 14, 98, 24, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 15, 64, 41, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 16, 81, 41, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 17, 98, 41, false, true, 1));

+    

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 119, 7, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 136, 7, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 153, 7, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 119, 24, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 136, 24, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 153, 24, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 119, 41, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 136, 41, false, true, 1));

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 153, 41, false, true, 1));

+    

+    addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 18, 8, 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);

+    }

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

+    if (tSlot != null)

+    {

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

+        return null;

+      }

+      if (aSlotIndex == 27)

+      {

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

+        if (((GT_MetaTileEntity_Regulator)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 >= 9) && (aSlotIndex < 18))

+      {

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

+        if (tStack != null) {

+          tSlot.putStack(GT_Utility.copy(new Object[] { tStack }));

+        } else if (tSlot.getStack() != null) {

+          if (aMouseclick == 0)

+          {

+            tSlot.getStack().stackSize -= (aShifthold == 1 ? 8 : 1);

+            if (tSlot.getStack().stackSize <= 0) {

+              tSlot.putStack(null);

+            }

+          }

+          else

+          {

+            tSlot.getStack().stackSize += (aShifthold == 1 ? 8 : 1);

+            if (tSlot.getStack().stackSize > tSlot.getStack().getMaxStackSize()) {

+              tSlot.getStack().stackSize = tSlot.getStack().getMaxStackSize();

+            }

+          }

+        }

+        return null;

+      }

+      if ((aSlotIndex >= 18) && (aSlotIndex < 27))

+      {

+        ((GT_MetaTileEntity_Regulator)this.mTileEntity.getMetaTileEntity()).mTargetSlots[(aSlotIndex - 18)] = Math.min(99, Math.max(0, ((GT_MetaTileEntity_Regulator)this.mTileEntity.getMetaTileEntity()).mTargetSlots[(aSlotIndex - 18)] + (aMouseclick == 0 ? -1 : 1) * (aShifthold == 0 ? 1 : 16)));

+        return null;

+      }

+    }

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

+  }

+  

+  public int[] mTargetSlots = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };

+  

+  public void detectAndSendChanges()

+  {

+    super.detectAndSendChanges();

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

+      return;

+    }

+    this.mTargetSlots = new int[9];

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

+      this.mTargetSlots[i] = ((GT_MetaTileEntity_Regulator)this.mTileEntity.getMetaTileEntity()).mTargetSlots[i];

+    }

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

+    while (var2.hasNext())

+    {

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

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

+        var1.sendProgressBarUpdate(this, 100 + i, this.mTargetSlots[i]);

+      }

+    }

+  }

+  

+  @SideOnly(Side.CLIENT)

+  public void updateProgressBar(int par1, int par2)

+  {

+    super.updateProgressBar(par1, par2);

+    switch (par1)

+    {

+    case 100: 

+      this.mTargetSlots[0] = par2; break;

+    case 101: 

+      this.mTargetSlots[1] = par2; break;

+    case 102: 

+      this.mTargetSlots[2] = par2; break;

+    case 103: 

+      this.mTargetSlots[3] = par2; break;

+    case 104: 

+      this.mTargetSlots[4] = par2; break;

+    case 105: 

+      this.mTargetSlots[5] = par2; break;

+    case 106: 

+      this.mTargetSlots[6] = par2; break;

+    case 107: 

+      this.mTargetSlots[7] = par2; break;

+    case 108: 

+      this.mTargetSlots[8] = par2;

+    }

+  }

+  

+  public int getSlotCount()

+  {

+    return 9;

+  }

+  

+  public int getShiftClickSlotCount()

+  {

+    return 9;

+  }

+}

diff --git a/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java b/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
new file mode 100644
index 0000000000..e28616e242
--- /dev/null
+++ b/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
@@ -0,0 +1,83 @@
+package gregtech.common.gui;

+

+import gregtech.api.gui.GT_ContainerMetaTile_Machine;

+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_SuperBuffer

+  extends GT_ContainerMetaTile_Machine

+{

+  public GT_Container_SuperBuffer(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity)

+  {

+    super(aInventoryPlayer, aTileEntity);

+  }

+  

+  public void addSlots(InventoryPlayer aInventoryPlayer)

+  {

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

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

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

+  }

+  

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

+  {

+    if (aSlotIndex < 0) {

+      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 == 0)

+      {

+        ((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 == 1)

+      {

+        ((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 == 2)

+      {

+        ((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 super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);

+  }

+  

+  public int getSlotCount()

+  {

+    return 0;

+  }

+  

+  public int getShiftClickSlotCount()

+  {

+    return 0;

+  }

+}

diff --git a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
new file mode 100644
index 0000000000..fadd979bcf
--- /dev/null
+++ b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
@@ -0,0 +1,177 @@
+package gregtech.common.gui;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.gui.GT_Container_BasicMachine;
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.gui.GT_Slot_Holo;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Teleporter;
+
+import java.util.Iterator;
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class GT_Container_Telep