Move sources and resources

50 files changed, 3915 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java
new file mode 100644
index 0000000000..04d8d91201
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java
@@ -0,0 +1,93 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import java.util.Iterator;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_Base;
+
+public class CONTAINER_AdvancedBoiler
+        extends GT_ContainerMetaTile_Machine {
+    public int mWaterAmount = 0;
+    public int mSteamAmount = 0;
+    public int mProcessingEnergy = 0;
+    public int mTemperature = 2;
+    
+    public CONTAINER_AdvancedBoiler(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+	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));
+    }
+
+    @Override
+	public int getSlotCount() {
+        return 4;
+    }
+
+    @Override
+	public int getShiftClickSlotCount() {
+        return 1;
+    }
+
+    @Override
+	public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {
+            return;
+        }
+        
+        int steamCapacity = ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).getSteamCapacity();
+        int waterCapacity = ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).getCapacity();
+        this.mTemperature = ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mTemperature;
+        this.mProcessingEnergy = ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;
+        this.mSteamAmount = (((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mSteam == null ? 0 : ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mSteam.amount);
+        this.mWaterAmount = (((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mFluid == null ? 0 : ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mFluid.amount);
+
+        this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54 / (((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).maxProgresstime() - 10)));
+        this.mSteamAmount = Math.min(54, Math.max(0, this.mSteamAmount * 54 / (steamCapacity - 100)));
+        this.mWaterAmount = Math.min(54, Math.max(0, this.mWaterAmount * 54 / (waterCapacity - 100)));
+        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);
+        }
+    }
+
+    @Override
+	@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/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java
new file mode 100644
index 0000000000..6d0eb6b14c
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java
@@ -0,0 +1,37 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The Container I use for all my Basic Machines
+ */
+public class CONTAINER_Cyclotron extends GT_ContainerMetaTile_Machine {
+
+	public CONTAINER_Cyclotron(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public CONTAINER_Cyclotron(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
+		super(aInventoryPlayer, aTileEntity, bindInventory);
+	}
+
+	@Override
+	public void addSlots(final InventoryPlayer aInventoryPlayer) {
+		//this.addSlotToContainer(new Slot(this.mTileEntity, 1, 154, 42));
+	}
+
+	@Override
+	public int getSlotCount() {
+		return 0;
+	}
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 0;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
new file mode 100644
index 0000000000..a4508781aa
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
@@ -0,0 +1,80 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import java.util.Iterator;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+
+import gregtech.api.gui.GT_Container_BasicTank;
+import gregtech.api.gui.GT_Slot_Output;
+import gregtech.api.gui.GT_Slot_Render;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeTank;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The Container I use for all my Basic Tanks
+ */
+public class CONTAINER_DeluxeTank extends GT_Container_BasicTank {
+
+	public CONTAINER_DeluxeTank(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	@Override
+	public void addSlots(final InventoryPlayer aInventoryPlayer) {
+		this.addSlotToContainer(new Slot(this.mTileEntity, 0, 80, 17));
+		this.addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 1, 80, 53));
+		this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, 2, 41, 42));
+		this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, 3, 59, 42));
+	}
+
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if (this.mTileEntity.isClientSide() || (this.mTileEntity.getMetaTileEntity() == null)) {
+			return;
+		}
+		if (((GT_MetaTileEntity_DeluxeTank) this.mTileEntity.getMetaTileEntity()).mFluid != null) {
+			this.mContent = ((GT_MetaTileEntity_DeluxeTank) this.mTileEntity.getMetaTileEntity()).mFluid.amount;
+		} else {
+			this.mContent = 0;
+		}
+		final Iterator var2 = this.crafters.iterator();
+		while (var2.hasNext()) {
+			final ICrafting var1 = (ICrafting) var2.next();
+			var1.sendProgressBarUpdate(this, 100, this.mContent & 65535);
+			var1.sendProgressBarUpdate(this, 101, this.mContent >>> 16);
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void updateProgressBar(final int par1, final int par2) {
+		super.updateProgressBar(par1, par2);
+		switch (par1) {
+		case 100:
+			this.mContent = (this.mContent & -65536) | par2;
+			break;
+		case 101:
+			this.mContent = (this.mContent & 65535) | (par2 << 16);
+			break;
+		}
+	}
+
+	@Override
+	public int getSlotCount() {
+		return 2;
+	}
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 1;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java
new file mode 100644
index 0000000000..17226a399e
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java
@@ -0,0 +1,51 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.slots.SlotAirFilter;
+import net.minecraft.entity.player.InventoryPlayer;
+
+
+public class CONTAINER_Hatch_Muffler_Advanced extends GT_ContainerMetaTile_Machine {
+
+	public long maxEU = 0;
+	public long storedEU = 0;
+
+	public CONTAINER_Hatch_Muffler_Advanced(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public CONTAINER_Hatch_Muffler_Advanced(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
+		super(aInventoryPlayer, aTileEntity, bindInventory);
+	}
+
+	@Override
+	public void addSlots(final InventoryPlayer aInventoryPlayer) {
+		this.addSlotToContainer(new SlotAirFilter(this.mTileEntity, 0, 80, 35));
+	}
+
+	@Override
+	public int getSlotCount() {
+		return 1;
+	}
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 1;
+	}
+
+	@Override
+	public void updateProgressBar(final int id, final int value) {
+		super.updateProgressBar(id, value);
+		switch (id) {		
+		default:
+			break;
+		}
+	}
+
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();		
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
new file mode 100644
index 0000000000..df8df2f775
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
@@ -0,0 +1,39 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The Container I use for all my Basic Machines
+ */
+public class CONTAINER_IndustrialCentrifuge extends GT_ContainerMetaTile_Machine {
+
+	public CONTAINER_IndustrialCentrifuge(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public CONTAINER_IndustrialCentrifuge(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
+		super(aInventoryPlayer, aTileEntity, bindInventory);
+	}
+
+	@Override
+	public void addSlots(final InventoryPlayer aInventoryPlayer) {
+		this.addSlotToContainer(new Slot(this.mTileEntity, 1, 154, 42));
+	}
+
+	@Override
+	public int getSlotCount() {
+		return 1;
+	}
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 1;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
new file mode 100644
index 0000000000..78150aedbe
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
@@ -0,0 +1,32 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.gui.GT_Slot_Output;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class CONTAINER_IronBlastFurnace extends GT_ContainerMetaTile_Machine {
+	public CONTAINER_IronBlastFurnace(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	@Override
+	public void addSlots(final InventoryPlayer aInventoryPlayer) {
+		this.addSlotToContainer(new Slot(this.mTileEntity, 0, 34, 16));
+		this.addSlotToContainer(new Slot(this.mTileEntity, 1, 34, 34));
+		this.addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 2, 86, 25));
+		this.addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 3, 104, 25));
+	}
+
+	@Override
+	public int getSlotCount() {
+		return 4;
+	}
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 2;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
new file mode 100644
index 0000000000..808eb90728
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
@@ -0,0 +1,42 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_MassFabricator;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The Container I use for all my Basic Machines
+ */
+public class CONTAINER_MatterFab extends GT_ContainerMetaTile_Machine {
+
+	public int mUUA_USED = ((GregtechMetaTileEntity_MassFabricator)this.mTileEntity.getMetaTileEntity()).getAmplifierUsed();
+	public int mUUM_MADE = ((GregtechMetaTileEntity_MassFabricator)this.mTileEntity.getMetaTileEntity()).getMatterProduced();
+
+	public CONTAINER_MatterFab(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public CONTAINER_MatterFab(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
+		super(aInventoryPlayer, aTileEntity, bindInventory);
+	}
+
+	@Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        //addSlotToContainer(new SlotNoInput(mTileEntity, 1, 152, 5));
+    }
+
+    @Override
+    public int getSlotCount() {
+        return 0;
+    }
+
+    @Override
+    public int getShiftClickSlotCount() {
+        return 0;
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MetaTileMachineLong.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MetaTileMachineLong.java
new file mode 100644
index 0000000000..6a3322ab2e
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MetaTileMachineLong.java
@@ -0,0 +1,244 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import gregtech.api.gui.GT_Container;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_LanguageManager;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+
+import java.util.Iterator;
+
+public class CONTAINER_MetaTileMachineLong extends GT_Container {
+
+	public int mActive = 0, mMaxProgressTime = 0, mProgressTime = 0, mSteam = 0, mSteamStorage = 0, mOutput = 0, mInput = 0, mID = 0, mDisplayErrorCode = 0;
+	private int oActive = 0, oMaxProgressTime = 0, oProgressTime = 0, oSteam = 0, oSteamStorage = 0, oOutput = 0, oInput = 0, oID = 0, oDisplayErrorCode = 0, mTimer = 0;
+
+	public long pEnergy, pStorage;
+	private long nEnergy, nStorage;
+
+	public short pIntMaxCountCurrent, pIntMaxCountMax;
+	private short nIntMaxCountCurrent, nIntMaxCountMax;
+
+	public CONTAINER_MetaTileMachineLong(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+
+		mTileEntity = aTileEntity;
+
+		if (mTileEntity != null && mTileEntity.getMetaTileEntity() != null) {
+			addSlots(aInventoryPlayer);
+			if (doesBindPlayerInventory()) bindPlayerInventory(aInventoryPlayer);
+			detectAndSendChanges();
+		} else {
+			aInventoryPlayer.player.openContainer = aInventoryPlayer.player.inventoryContainer;
+		}
+	}
+	public CONTAINER_MetaTileMachineLong(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, boolean doesBindInventory) {
+		super(aInventoryPlayer, aTileEntity);
+		mTileEntity = aTileEntity;
+
+		if (mTileEntity != null && mTileEntity.getMetaTileEntity() != null) {
+			addSlots(aInventoryPlayer);
+			if (doesBindPlayerInventory() && doesBindInventory) bindPlayerInventory(aInventoryPlayer);
+			detectAndSendChanges();
+		} else {
+			aInventoryPlayer.player.openContainer = aInventoryPlayer.player.inventoryContainer;
+		}
+	}
+
+	private Pair<Integer, Integer> getPowerStored(){
+		final long mStoredPower = this.pEnergy;
+		long mMaxInts = (mStoredPower/Integer.MAX_VALUE);
+		long mLeftOver = (mStoredPower % Integer.MAX_VALUE);		
+		if (mMaxInts < 0 || mMaxInts >= /*4294967298L*/ Integer.MAX_VALUE) {
+			return new Pair<Integer, Integer>(-1, 0);
+		}
+		if (mLeftOver < 0 || mLeftOver > Integer.MAX_VALUE) {
+			mLeftOver = 0;
+		}		
+		Pair<Integer, Integer> power = new Pair<Integer, Integer>((int) mMaxInts, (int) mLeftOver);
+		return power;
+	}
+	
+	private Pair<Integer, Integer> getMaxPowerStored(){
+		final long mMaxStoredPower = this.pStorage;
+		long mMaxInts = (mMaxStoredPower/Integer.MAX_VALUE);
+		long mLeftOver = (mMaxStoredPower % Integer.MAX_VALUE);		
+		if (mMaxInts < 0 || mMaxInts >= /*4294967298L*/ Integer.MAX_VALUE) {
+			return new Pair<Integer, Integer>(-1, 0);
+		}
+		if (mLeftOver < 0 || mLeftOver > Integer.MAX_VALUE) {
+			mLeftOver = 0;
+		}		
+		Pair<Integer, Integer> power = new Pair<Integer, Integer>((int) mMaxInts, (int) mLeftOver);
+		return power;
+	}
+
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
+		pStorage = Math.min(Long.MAX_VALUE, mTileEntity.getEUCapacity());
+		pEnergy = Math.min(Long.MAX_VALUE, mTileEntity.getStoredEU());
+		mSteamStorage = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getSteamCapacity());
+		mSteam = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getStoredSteam());
+		mOutput = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getOutputVoltage());
+		mInput = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getInputVoltage());
+		mDisplayErrorCode = mTileEntity.getErrorDisplayID();
+		mProgressTime = mTileEntity.getProgress();
+		mMaxProgressTime = mTileEntity.getMaxProgress();
+		mActive = mTileEntity.isActive() ? 1 : 0;
+		mTimer++;
+		
+		Pair<Integer, Integer> powerPacket = getPowerStored();
+		Pair<Integer, Integer> maxPowerPacket = getMaxPowerStored();
+		
+		int mPacketsToSend = powerPacket.getKey();
+		int mLeftOverPowerStored = powerPacket.getValue();
+
+		int mMaxStorageA = maxPowerPacket.getKey();
+		int mMaxStorageB = maxPowerPacket.getValue();
+		
+		//Someone has a VERY FULL power supply.
+		if (mPacketsToSend == -1) {
+			Logger.INFO("TOO MUCH MATH - USE BIGINTEGER - GAME BREAKING BUG MAY OCCUR");
+			return;
+		}
+		
+
+		Iterator var2 = this.crafters.iterator();
+		while (var2.hasNext()) {
+			ICrafting var1 = (ICrafting) var2.next();
+			if (mTimer % 500 == 10 || nEnergy != pEnergy) {
+				var1.sendProgressBarUpdate(this, 0, mLeftOverPowerStored & 65535);
+				var1.sendProgressBarUpdate(this, 1, mLeftOverPowerStored >>> 16);
+				var1.sendProgressBarUpdate(this, 7730, mPacketsToSend);
+			}
+			if (mTimer % 500 == 10 || nStorage != pStorage) {
+				var1.sendProgressBarUpdate(this, 2, mMaxStorageB & 65535);
+				var1.sendProgressBarUpdate(this, 3, mMaxStorageB >>> 16);
+				var1.sendProgressBarUpdate(this, 7731, mMaxStorageA);
+			}
+			if (mTimer % 500 == 10 || oOutput != mOutput) {
+				var1.sendProgressBarUpdate(this, 4, mOutput);
+			}
+			if (mTimer % 500 == 10 || oInput != mInput) {
+				var1.sendProgressBarUpdate(this, 5, mInput);
+			}
+			if (mTimer % 500 == 10 || oDisplayErrorCode != mDisplayErrorCode) {
+				var1.sendProgressBarUpdate(this, 6, mDisplayErrorCode);
+			}
+			if (mTimer % 500 == 10 || oProgressTime != mProgressTime) {
+				var1.sendProgressBarUpdate(this, 11, mProgressTime & 65535);
+				var1.sendProgressBarUpdate(this, 12, mProgressTime >>> 16);
+			}
+			if (mTimer % 500 == 10 || oMaxProgressTime != mMaxProgressTime) {
+				var1.sendProgressBarUpdate(this, 13, mMaxProgressTime & 65535);
+				var1.sendProgressBarUpdate(this, 14, mMaxProgressTime >>> 16);
+			}
+			if (mTimer % 500 == 10 || oID != mID) {
+				var1.sendProgressBarUpdate(this, 15, mID);
+			}
+			if (mTimer % 500 == 10 || oActive != mActive) {
+				var1.sendProgressBarUpdate(this, 16, mActive);
+			}
+			if (mTimer % 500 == 10 || oSteam != mSteam) {
+				var1.sendProgressBarUpdate(this, 17, mSteam & 65535);
+				var1.sendProgressBarUpdate(this, 18, mSteam >>> 16);
+			}
+			if (mTimer % 500 == 10 || oSteamStorage != mSteamStorage) {
+				var1.sendProgressBarUpdate(this, 19, mSteamStorage & 65535);
+				var1.sendProgressBarUpdate(this, 20, mSteamStorage >>> 16);
+			}
+		}
+
+		oID = mID;
+		oSteam = mSteam;
+		oInput = mInput;
+		oActive = mActive;
+		oOutput = mOutput;
+		nEnergy = pEnergy;
+		nStorage = pStorage;
+		oSteamStorage = mSteamStorage;
+		oProgressTime = mProgressTime;
+		oMaxProgressTime = mMaxProgressTime;
+		oDisplayErrorCode = mDisplayErrorCode;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void updateProgressBar(int par1, int par2) {
+		super.updateProgressBar(par1, par2);
+		switch (par1) {
+			/*case 7730:
+				pIntMaxCountCurrent = par2;*/
+			case 0:
+				pEnergy = pEnergy & -65536 | par2;
+				break;
+			case 1:
+				pEnergy = pEnergy & 65535 | par2 << 16;
+				break;
+			case 2:
+				pStorage = pStorage & -65536 | par2;
+				break;
+			case 3:
+				pStorage = pStorage & 65535 | par2 << 16;
+				break;
+			case 4:
+				mOutput = par2;
+				break;
+			case 5:
+				mInput = par2;
+				break;
+			case 6:
+				mDisplayErrorCode = par2;
+				break;
+			case 11:
+				mProgressTime = mProgressTime & -65536 | par2;
+				break;
+			case 12:
+				mProgressTime = mProgressTime & 65535 | par2 << 16;
+				break;
+			case 13:
+				mMaxProgressTime = mMaxProgressTime & -65536 | par2;
+				break;
+			case 14:
+				mMaxProgressTime = mMaxProgressTime & 65535 | par2 << 16;
+				break;
+			case 15:
+				mID = par2;
+				break;
+			case 16:
+				mActive = par2;
+				break;
+			case 17:
+				mSteam = mSteam & -65536 | par2;
+				break;
+			case 18:
+				mSteam = mSteam & 65535 | par2 << 16;
+				break;
+			case 19:
+				mSteamStorage = mSteamStorage & -65536 | par2;
+				break;
+			case 20:
+				mSteamStorage = mSteamStorage & 65535 | par2 << 16;
+				break;
+		}
+	}
+
+	@Override
+	public boolean canInteractWith(EntityPlayer player) {
+		return mTileEntity.isUseableByPlayer(player);
+	}
+
+	public String trans(String aKey, String aEnglish){
+		return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_"+aKey, aEnglish, false);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
new file mode 100644
index 0000000000..88b9661c95
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
@@ -0,0 +1,283 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Recipe;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The Container I use for all my Basic Machines
+ */
+public class CONTAINER_MultiMachine extends GT_ContainerMetaTile_Machine {
+
+	public String[] mTileDescription;
+	private String[] oTileDescription;
+	
+	private GregtechMeta_MultiBlockBase mMCTEI;
+	private boolean mControllerSet = false;
+
+
+	public CONTAINER_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public CONTAINER_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
+		super(aInventoryPlayer, aTileEntity, bindInventory);
+	}
+	
+	public static void setControllerInstance(CONTAINER_MultiMachine aContainer, IGregTechTileEntity aTile) {		
+		if (aTile == null) {
+			return;
+		}
+		final IMetaTileEntity aMetaTileEntity = aTile.getMetaTileEntity();
+		if (aMetaTileEntity == null) {
+			return;
+		}
+		if (aMetaTileEntity instanceof GregtechMeta_MultiBlockBase) {
+			aContainer.mMCTEI = (GregtechMeta_MultiBlockBase) aMetaTileEntity;
+		}		
+	}
+
+	public int aTotalTickTime = 0;
+	public int aMaxParallel = 0;
+	public int aPollutionTick = 0;
+	public int aMaxInputVoltage = 0;
+	public int aInputTier = 0;
+	public int aOutputTier = 0;
+	public int aRecipeDuration = 0;
+	public int aRecipeEU = 0;
+	public int aRecipeSpecial = 0;	
+	public int aPollutionReduction = 0;
+	public int aStoredEnergy = 0;
+	public int aMaxEnergy = 0;
+	public int aEfficiency = 0;
+
+	private int oTotalTickTime = 0;
+	private int oMaxParallel = 0;
+	private int oPollutionTick = 0;
+	private int oMaxInputVoltage = 0;
+	private int oInputTier = 0;
+	private int oOutputTier = 0;
+	private int oRecipeDuration = 0;
+	private int oRecipeEU = 0;
+	private int oRecipeSpecial = 0;	
+	private int oPollutionReduction = 0;
+	private int oStoredEnergy = 0;
+	private int oMaxEnergy = 0;
+	private int oEfficiency = 0;
+
+	private static Field timer;
+	//private static Field crafters;
+
+	@Override
+	public final void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if (this.mTileEntity.isClientSide() || this.mTileEntity.getMetaTileEntity() == null) {
+			return;
+		}
+		if (!mControllerSet) {
+			setControllerInstance(this, this.mTileEntity);
+		}		
+		mControllerSet = (mMCTEI != null);		
+		if (timer == null) {
+			timer = ReflectionUtils.getField(getClass(), "mTimer");
+		}
+		if (crafters == null) {
+			//crafters = ReflectionUtils.getField(getClass(), "crafters");
+		}
+		if (timer != null && crafters != null && mControllerSet) {
+			//Logger.INFO("Trying to update clientside GUI data");
+			try {
+				//Logger.INFO("0");		
+				int aTimer = (int) ReflectionUtils.getFieldValue(timer, this);				
+				
+				//List crafters1List = (List) crafters1;
+				List<ICrafting> crafters2 = new ArrayList<ICrafting>();
+				//Logger.INFO("1");		
+				for (Object o : crafters) {
+					if (o instanceof ICrafting) {
+						crafters2.add((ICrafting) o);
+					}
+				}
+				//Logger.INFO("2");		
+				if (!crafters2.isEmpty()) {
+					//Logger.INFO("3");		
+					handleInitialFieldSetting();
+
+					try {
+						//Logger.INFO("4");		
+						for (final ICrafting var3 : crafters2) {
+							handleCraftingEvent(aTimer, var3);
+						}
+						//Logger.INFO("5");		
+						handleInternalFieldSetting();
+						//Logger.INFO("6");		
+					} catch (Throwable t) {
+
+					}
+				}
+			} catch (Throwable t) {
+				t.printStackTrace();
+			}
+		}
+		else {
+			Logger.INFO("Failed.");			
+		}
+	}
+
+	public void handleInitialFieldSetting() {
+		this.aTotalTickTime = MathUtils.balance((int) mMCTEI.getTotalRuntimeInTicks(), Integer.MIN_VALUE, Integer.MAX_VALUE);
+		this.aMaxParallel = mMCTEI.getMaxParallelRecipes();
+		this.aPollutionTick = mMCTEI.getPollutionPerTick(null);
+		this.aMaxInputVoltage = MathUtils.balance((int) mMCTEI.getMaxInputVoltage(), Integer.MIN_VALUE, Integer.MAX_VALUE);
+		this.aInputTier = MathUtils.balance((int) mMCTEI.getInputTier(), Integer.MIN_VALUE, Integer.MAX_VALUE);
+		this.aOutputTier = MathUtils.balance((int) mMCTEI.getOutputTier(), Integer.MIN_VALUE, Integer.MAX_VALUE);		
+		if (mMCTEI.mLastRecipe != null) {
+			GT_Recipe aRecipe = mMCTEI.mLastRecipe;
+			this.aRecipeDuration = MathUtils.balance(aRecipe.mDuration, Integer.MIN_VALUE, Integer.MAX_VALUE);
+			this.aRecipeEU = MathUtils.balance(aRecipe.mEUt, Integer.MIN_VALUE, Integer.MAX_VALUE);
+			this.aRecipeSpecial = MathUtils.balance(aRecipe.mSpecialValue, Integer.MIN_VALUE, Integer.MAX_VALUE);			
+		}		
+		this.aPollutionReduction = mMCTEI.getPollutionReductionForAllMufflers();
+		
+		this.aStoredEnergy = MathUtils.balance((int) mMCTEI.getStoredEnergyInAllEnergyHatches(), Integer.MIN_VALUE, Integer.MAX_VALUE);
+		this.aMaxEnergy = MathUtils.balance((int) mMCTEI.getMaxEnergyStorageOfAllEnergyHatches(), Integer.MIN_VALUE, Integer.MAX_VALUE);
+		this.aEfficiency = MathUtils.balance(mMCTEI.mEfficiency, Integer.MIN_VALUE, Integer.MAX_VALUE);		
+	}
+
+	public void handleCraftingEvent(int aTimer, ICrafting aCrafter) {
+		int aID = 750;
+		if (aTimer % 500 == 10 || this.oTotalTickTime != this.aTotalTickTime) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aTotalTickTime);
+		}
+		if (aTimer % 500 == 10 || this.oMaxParallel != this.aMaxParallel) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aMaxParallel);
+		}
+		if (aTimer % 500 == 10 || this.oPollutionTick != this.aPollutionTick) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aPollutionTick);
+		}
+		if (aTimer % 500 == 10 || this.oMaxInputVoltage != this.aMaxInputVoltage) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aMaxInputVoltage);
+		}
+		if (aTimer % 500 == 10 || this.oInputTier != this.aInputTier) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aInputTier);
+		}
+		if (aTimer % 500 == 10 || this.oOutputTier != this.aOutputTier) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aOutputTier);
+		}
+		if (aTimer % 500 == 10 || this.oRecipeDuration != this.aRecipeDuration) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aRecipeDuration);
+		}
+		if (aTimer % 500 == 10 || this.oRecipeEU != this.aRecipeEU) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aRecipeEU);
+		}
+		if (aTimer % 500 == 10 || this.oRecipeSpecial != this.aRecipeSpecial) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aRecipeSpecial);
+		}
+		if (aTimer % 500 == 10 || this.oPollutionReduction != this.aPollutionReduction) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aPollutionReduction);
+		}
+		if (aTimer % 500 == 10 || this.oStoredEnergy != this.aStoredEnergy) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aStoredEnergy);
+		}
+		if (aTimer % 500 == 10 || this.oMaxEnergy != this.aMaxEnergy) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aMaxEnergy);
+		}
+		if (aTimer % 500 == 10 || this.oEfficiency != this.aEfficiency) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aEfficiency);
+		}
+	}
+
+	public void handleInternalFieldSetting() {
+		this.oTotalTickTime = this.aTotalTickTime;
+		this.oMaxParallel = this.aMaxParallel;
+		this.oPollutionTick = this.aPollutionTick;
+		this.oMaxInputVoltage = this.aMaxInputVoltage;
+		this.oInputTier = this.aInputTier;
+		this.oOutputTier = this.aOutputTier;
+		this.oRecipeDuration = this.aRecipeDuration;
+		this.oRecipeEU = this.aRecipeEU;
+		this.oRecipeSpecial = this.aRecipeSpecial;
+		this.oPollutionReduction = this.aPollutionReduction;
+		this.oStoredEnergy = this.aStoredEnergy;
+		this.oMaxEnergy = this.aMaxEnergy;
+		this.oEfficiency = this.aEfficiency;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void updateProgressBar(final int par1, final int par2) {
+		super.updateProgressBar(par1, par2);		
+		int shiftedSwitch = par1 - 750;		
+		switch (shiftedSwitch) {
+		case 0: {
+			this.aTotalTickTime = par2;
+			break;
+		}
+		case 1: {
+			this.aMaxParallel = par2;
+			break;
+		}
+		case 2: {
+			this.aPollutionTick = par2;
+			break;
+		}
+		case 3: {
+			this.aMaxInputVoltage = par2;
+			break;
+		}
+		case 4: {
+			this.aInputTier = par2;
+			break;
+		}
+		case 5: {
+			this.aOutputTier = par2;
+			break;
+		}
+		case 6: {
+			this.aRecipeDuration = par2;
+			break;
+		}
+		case 7: {
+			this.aRecipeEU = par2;
+			break;
+		}
+		case 8: {
+			this.aRecipeSpecial = par2;
+			break;
+		}
+		case 9: {
+			this.aPollutionReduction = par2;
+			break;
+		}
+		case 10: {
+			this.aStoredEnergy = par2;
+			break;
+		}
+		case 11: {
+			this.aMaxEnergy = par2;
+			break;
+		}
+		case 12: {
+			this.aEfficiency = par2;
+			break;
+		}
+		}
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java
new file mode 100644
index 0000000000..2d63a13d60
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java
@@ -0,0 +1,27 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+
+public class CONTAINER_MultiMachine_NoPlayerInventory extends CONTAINER_MultiMachine {
+
+	public CONTAINER_MultiMachine_NoPlayerInventory(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public CONTAINER_MultiMachine_NoPlayerInventory(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
+		super(aInventoryPlayer, aTileEntity, bindInventory);
+	}
+    
+    public boolean doesBindPlayerInventory() {
+        return false;
+    }
+
+    @Override
+    public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+    	return null;
+    }
+	
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java
new file mode 100644
index 0000000000..937513751b
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java
@@ -0,0 +1,41 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+
+import gregtech.api.gui.GT_Container_MultiMachine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.slots.SlotNoInput;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class CONTAINER_PowerSubStation extends GT_Container_MultiMachine {
+	
+	public CONTAINER_PowerSubStation(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public CONTAINER_PowerSubStation(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+			final boolean bindInventory) {
+		super(aInventoryPlayer, aTileEntity, bindInventory);
+	}
+
+	public void addSlots(final InventoryPlayer aInventoryPlayer) {
+		this.addSlotToContainer(new Slot((IInventory) this.mTileEntity, 1, 155, 5));
+		this.addSlotToContainer(new SlotNoInput((IInventory) this.mTileEntity, 2, 155, 23));
+		
+		for (int i = 0; i < 9; ++i) {
+			this.addSlotToContainer(new Slot((IInventory) aInventoryPlayer, i, 8 + i * 18, 167));
+		}
+		
+	}
+
+	public int getSlotCount() {
+		return 10;
+	}
+
+	public int getShiftClickSlotCount() {
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
new file mode 100644
index 0000000000..9a84ba66ab
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
@@ -0,0 +1,124 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import java.util.UUID;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.gui.GT_Slot_Holo;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.util.player.PlayerCache;
+import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock;
+
+public class CONTAINER_SafeBlock
+extends GT_ContainerMetaTile_Machine {
+	public CONTAINER_SafeBlock(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	//public String UUID = ((BaseMetaTileEntity)mTileEntity).getMetaTileEntity().getBaseMetaTileEntity().getOwnerName();
+	public UUID ownerUUID = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).ownerUUID;
+	public String tempPlayer = PlayerCache.lookupPlayerByUUID(this.ownerUUID);
+	public boolean blockStatus = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable;
+
+	@Override
+	public void addSlots(final InventoryPlayer aInventoryPlayer) {
+		for (int y = 0; y < 3; y++) {
+			for (int x = 0; x < 9; x++) {
+				this.addSlotToContainer(new Slot(this.mTileEntity, x + (y * 9), 8 + (x * 18), 5 + (y * 18)));
+			}
+		}
+		this.addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 8, 63, false, true, 1));
+		this.addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 26, 63, false, true, 1));
+		this.addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 44, 63, false, true, 1));
+	}
+
+	@Override
+	public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+		final int runs = 0;
+		if (aSlotIndex < 27) {
+			return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+		}
+		final Slot tSlot = (Slot) this.inventorySlots.get(aSlotIndex);
+		if (tSlot != null) {
+			if (this.mTileEntity.getMetaTileEntity() == null) {
+				return null;
+			}
+			if (aSlotIndex == 27) {
+
+
+				/*((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput);
+                if (((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput) {
+                	if (aPlayer != null && aPlayer instanceof EntityPlayerMP && (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bOutput != false)) {
+
+                   Utils.LOG_INFO(String.valueOf(Sys.is64Bit()));
+                  Utils.messagePlayer(aPlayer, "Salmon");
+                    }
+
+                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");
+                } else {
+                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");
+                }
+                return null;*/
+
+
+			}
+			if (aSlotIndex == 28) {}
+			/*  ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);
+                if (((GregtechMetaSafeBlock) 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) /*{
+				if (((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable) {
+					if (((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable) {
+						makeIndestructible(aPlayer);
+					}
+					else {
+
+					}
+				} else {
+					makeIndestructible(aPlayer);
+				}
+				return null;
+			}*/
+
+			{
+				((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable);
+				this.blockStatus = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable;
+				this.ownerUUID = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).ownerUUID;
+				//Utils.messagePlayer(aPlayer, "Is the safe locked? "+String.valueOf(((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable).toUpperCase());
+				/*if (aPlayer != null && aPlayer instanceof EntityPlayerMP && (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable != false)) {
+				UnbreakableBlockManager Xasda = new UnbreakableBlockManager();
+				Xasda.setmTileEntity((BaseMetaTileEntity) mTileEntity, aPlayer);
+				}
+				else {
+					UnbreakableBlockManager Xasda = new UnbreakableBlockManager();
+					Xasda.setmTileEntity((BaseMetaTileEntity) mTileEntity, aPlayer);
+				}*/
+				return null;
+			}
+
+
+		}
+		return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+	}
+
+	@Override
+	public int getSlotCount() {
+		return 27;
+	}
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 27;
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
new file mode 100644
index 0000000000..a3f58836e3
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
@@ -0,0 +1,85 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import java.util.Iterator;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
+
+public class CONTAINER_SolarGenerator
+extends GT_ContainerMetaTile_Machine {
+	public int mWaterAmount = 0;
+	public int mSteamAmount = 0;
+	public int mProcessingEnergy = 0;
+	public int mTemperature = 2;
+	public CONTAINER_SolarGenerator(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	@Override
+	public void addSlots(final 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));
+	}
+
+	@Override
+	public int getSlotCount() {
+		return 0;
+	}
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 0;
+	}
+
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {
+			return;
+		}
+		this.mTemperature = ((GregtechMetaTileEntitySolarGenerator) this.mTileEntity.getMetaTileEntity()).mSolarCharge;
+		this.mProcessingEnergy = ((GregtechMetaTileEntitySolarGenerator) this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;
+
+		this.mTemperature = Math.min(54, Math.max(0, (this.mTemperature * 54) / (((GregtechMetaTileEntitySolarGenerator) this.mTileEntity.getMetaTileEntity()).maxProgresstime() - 10)));
+		this.mEnergy = (int) Math.min(Integer.MAX_VALUE, this.mTileEntity.getStoredEU());
+		this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, (this.mProcessingEnergy * 14) / 1000));
+
+		final Iterator var2 = this.crafters.iterator();
+		while (var2.hasNext()) {
+			final 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);
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void updateProgressBar(final int par1, final 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/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
new file mode 100644
index 0000000000..6fcd53b139
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
@@ -0,0 +1,99 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import java.util.Iterator;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase;
+
+public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine
+{
+	public CONTAINER_SteamCondenser(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity)
+	{
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	@Override
+	public void addSlots(final InventoryPlayer aInventoryPlayer)
+	{
+		this.addSlotToContainer(new Slot(this.mTileEntity, 2, 116, 62));
+		this.addSlotToContainer(new Slot(this.mTileEntity, 0, 44, 26));
+		this.addSlotToContainer(new Slot(this.mTileEntity, 1, 44, 62));
+		this.addSlotToContainer(new Slot(this.mTileEntity, 3, 116, 26));
+	}
+
+	@Override
+	public int getSlotCount()
+	{
+		return 4;
+	}
+
+	@Override
+	public int getShiftClickSlotCount()
+	{
+		return 1;
+	}
+
+	public int mWaterAmount = 0;
+	public int mSteamAmount = 0;
+	public int mProcessingEnergy = 0;
+	public int mTemperature = 2;
+	public long mTickingTime = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).RI;
+
+	@Override
+	public void detectAndSendChanges()
+	{
+		super.detectAndSendChanges();
+		if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {
+			return;
+		}
+		int steamCapacity = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).getSteamCapacity();
+		int waterCapacity = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).getCapacity();
+		this.mTemperature = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mTemperature;
+		this.mProcessingEnergy = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;
+		this.mSteamAmount = (((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mSteam == null ? 0 : ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mSteam.amount);
+		this.mWaterAmount = (((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mFluid == null ? 0 : ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mFluid.amount);
+		this.mTickingTime = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).RI;
+
+		this.mTemperature = Math.min(54, Math.max(0, (this.mTemperature * 54) / (((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).maxProgresstime() - 10)));
+		this.mSteamAmount = Math.min(54, Math.max(0, (this.mSteamAmount * 54) / (steamCapacity - 100)));
+		this.mWaterAmount = Math.min(54, Math.max(0, (this.mWaterAmount * 54) / (waterCapacity - 100)));
+		this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, (this.mProcessingEnergy * 14) / 1000));
+
+		final Iterator var2 = this.crafters.iterator();
+		while (var2.hasNext())
+		{
+			final 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);
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void updateProgressBar(final int par1, final 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;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java
new file mode 100644
index 0000000000..dcab57c380
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java
@@ -0,0 +1,78 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import java.util.Iterator;
+
+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 gtPlusPlus.core.slots.SlotLockedInput;
+import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest;
+import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_Large;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.item.ItemStack;
+
+public class CONTAINER_SuperChest extends GT_ContainerMetaTile_Machine {
+	
+	public int mContent = 0;
+	private ItemStack mLockedSlotStack = null;
+
+	public CONTAINER_SuperChest(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public void addSlots(InventoryPlayer aInventoryPlayer) {
+		this.addSlotToContainer(new SlotLockedInput(this.mTileEntity, 0, 80, 17, mLockedSlotStack));
+		this.addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 1, 80, 53));
+		this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, 2, 59, 42));
+	}
+
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if (!this.mTileEntity.isClientSide() && this.mTileEntity.getMetaTileEntity() != null) {			
+			if (this.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_TieredChest) {
+				this.mContent = ((GT_MetaTileEntity_TieredChest) this.mTileEntity.getMetaTileEntity()).mItemCount;
+				mLockedSlotStack =  ((GT_MetaTileEntity_TieredChest) this.mTileEntity.getMetaTileEntity()).mItemStack;
+			}
+			if (this.mTileEntity.getMetaTileEntity() instanceof GT4Entity_Shelf_Large) {
+				this.mContent = ((GT4Entity_Shelf_Large) this.mTileEntity.getMetaTileEntity()).mItemCount;
+				mLockedSlotStack =  ((GT4Entity_Shelf_Large) this.mTileEntity.getMetaTileEntity()).mItemStack;
+			}
+			else {
+				this.mContent = 0;
+			}
+
+			Iterator var2 = this.crafters.iterator();
+
+			while (var2.hasNext()) {
+				ICrafting var1 = (ICrafting) var2.next();
+				var1.sendProgressBarUpdate(this, 100, this.mContent & 65535);
+				var1.sendProgressBarUpdate(this, 101, this.mContent >>> 16);
+			}
+		}		
+	}
+
+	@SideOnly(Side.CLIENT)
+	public void updateProgressBar(int par1, int par2) {
+		super.updateProgressBar(par1, par2);
+		switch (par1) {
+			case 100 :
+				this.mContent = this.mContent & -65536 | par2;
+				break;
+			case 101 :
+				this.mContent = this.mContent & 65535 | par2 << 16;
+		}
+
+	}
+
+	public int getSlotCount() {
+		return 2;
+	}
+
+	public int getShiftClickSlotCount() {
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java
new file mode 100644
index 0000000000..bf4dffb904
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java
@@ -0,0 +1,71 @@
+
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import java.util.List;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.slots.SlotBuzzSaw;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm;
+
+public class CONTAINER_TreeFarmer extends GT_ContainerMetaTile_Machine {
+
+	public long maxEU = 0;
+	public long storedEU = 0;
+
+	public CONTAINER_TreeFarmer(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public CONTAINER_TreeFarmer(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
+		super(aInventoryPlayer, aTileEntity, bindInventory);
+	}
+
+	@Override
+	public void addSlots(final InventoryPlayer aInventoryPlayer) {
+		this.addSlotToContainer(new SlotBuzzSaw(this.mTileEntity, 1, 80, 17));
+	}
+
+	@Override
+	public int getSlotCount() {
+		return 1;
+	}
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 1;
+	}
+
+	@Override
+	public void updateProgressBar(final int id, final int value) {
+		super.updateProgressBar(id, value);
+		switch (id) {
+		case 100:
+			this.maxEU = value;
+			return;
+		case 101:
+			this.storedEU = value;
+			break;
+		default:
+			break;
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		for(final ICrafting crafting : (List<ICrafting>)this.crafters) {
+			crafting.sendProgressBarUpdate(this, 100, (int) ((GregtechMetaTileEntityTreeFarm) this.mTileEntity.getMetaTileEntity()).maxEUStore());
+			crafting.sendProgressBarUpdate(this, 101, (int) ((GregtechMetaTileEntityTreeFarm) this.mTileEntity.getMetaTileEntity()).getEUVar());
+			if (((GregtechMetaTileEntityTreeFarm) this.mTileEntity.getMetaTileEntity()).isCorrectMachinePart(this.mTileEntity.getStackInSlot(1))){	
+				this.mTileEntity.markDirty();
+				}
+		}
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java
new file mode 100644
index 0000000000..d532a98030
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java
@@ -0,0 +1,44 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class GUI_AdvancedBoiler
+        extends GT_GUIContainerMetaTile_Machine {
+    public GUI_AdvancedBoiler(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTextureName) {
+        super(new CONTAINER_AdvancedBoiler(aInventoryPlayer, aTileEntity), "miscutils:textures/gui/" + aTextureName);
+    }
+
+    @Override
+	protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        this.fontRendererObj.drawString("Advanced Boiler", 8, 4, 4210752);
+    }
+
+    @Override
+	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (this.width - this.xSize) / 2;
+        int y = (this.height - this.ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+        if (this.mContainer != null) {
+            int tScale = ((CONTAINER_AdvancedBoiler) this.mContainer).mSteamAmount;
+            if (tScale > 0) {
+                drawTexturedModalRect(x + 70, y + 25 + 54 - tScale, 194, 54 - tScale, 10, tScale);
+            }
+            tScale = ((CONTAINER_AdvancedBoiler) this.mContainer).mWaterAmount;
+            if (tScale > 0) {
+                drawTexturedModalRect(x + 83, y + 25 + 54 - tScale, 204, 54 - tScale, 10, tScale);
+            }
+            tScale = ((CONTAINER_AdvancedBoiler) this.mContainer).mTemperature;
+            if (tScale > 0) {
+                drawTexturedModalRect(x + 96, y + 25 + 54 - tScale, 214, 54 - tScale, 10, tScale);
+            }
+            tScale = ((CONTAINER_AdvancedBoiler) this.mContainer).mProcessingEnergy;
+            if (tScale > 0) {
+                drawTexturedModalRect(x + 117, y + 44 + 14 - tScale, 177, 14 - tScale, 15, tScale + 1);
+            }
+        }
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java
new file mode 100644
index 0000000000..0be44fa616
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java
@@ -0,0 +1,44 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.gui.GT_Container_MultiMachine;
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GUI_Cyclotron extends GT_GUIContainerMetaTile_Machine
+{
+    public final String mNEI;
+    public final String mName;
+    
+    public GUI_Cyclotron(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aNEI) {
+        super(new GT_Container_MultiMachine(aInventoryPlayer, aTileEntity, false), "gregtech:textures/gui/multimachines/" + "FusionComputer.png");
+        this.mName = aName;
+        this.mNEI = aNEI;
+    }
+    
+    @Override
+    protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+        this.fontRendererObj.drawString(this.mName, 8, -10, 16448255);
+        if (this.mContainer != null) {
+            if ((((GT_Container_MultiMachine)this.mContainer).mDisplayErrorCode & 0x40) != 0x0) {
+                this.fontRendererObj.drawString("Incomplete Structure.", 10, 8, 16448255);
+            }
+            if (((GT_Container_MultiMachine)this.mContainer).mDisplayErrorCode == 0) {
+                if (((GT_Container_MultiMachine)this.mContainer).mActive == 0) {
+                    this.fontRendererObj.drawString("Hit with Soft Hammer to (re-)start the Machine if it doesn't start.", -70, 170, 16448255);
+                }
+                else {
+                    this.fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255);
+                }
+            }            
+        }
+    }
+    
+    @Override
+    protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        final int x = (this.width - this.xSize) / 2;
+        final int y = (this.height - this.ySize) / 2;
+        this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);        
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java
new file mode 100644
index 0000000000..c6d8d4ef7e
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java
@@ -0,0 +1,37 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.StatCollector;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class GUI_DeluxeTank extends GT_GUIContainerMetaTile_Machine {
+
+	private final String mName;
+
+	public GUI_DeluxeTank(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName) {
+		super(new CONTAINER_DeluxeTank(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "BasicTank.png");
+		this.mName = aName;
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, (this.ySize - 96) + 2, 4210752);
+		this.fontRendererObj.drawString(this.mName, 8, 6, 4210752);
+		if (this.mContainer != null) {
+			this.fontRendererObj.drawString("Fuel  | A | B |", 10, 20, 16448255);
+			//fontRendererObj.drawString(GT_Utility.parseNumberToString(((CONTAINER_DeluxeTank) mContainer).mContent), 10, 30, 16448255);
+		}
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java
new file mode 100644
index 0000000000..4b998f6487
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java
@@ -0,0 +1,46 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GUI_Hatch_Muffler_Advanced extends GT_GUIContainerMetaTile_Machine {
+
+	String mName = "";
+	long maxPower = 0;
+	long storedPower = 0;
+
+	public GUI_Hatch_Muffler_Advanced(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aTextureFile) {
+		super(new CONTAINER_Hatch_Muffler_Advanced(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
+		this.mName = aName;
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString(this.mName, 8, 8, 16448255);
+		/*
+		 * ReflectionUtils.setField(this.fontRendererObj, "underlineStyle", true);
+		 * ReflectionUtils.setField(this.fontRendererObj, "italicStyle", true);
+		 * ReflectionUtils.setField(this.fontRendererObj, "boldStyle", true); boolean
+		 * isBold = ReflectionUtils.getField(this.fontRendererObj, "boldStyle");
+		 * this.fontRendererObj.drawString("Insert Air Filters - Bold: "+isBold, 8, 18,
+		 * 16448255);
+		 */
+		if (this.mContainer != null) {
+			//this.maxPower = ((CONTAINER_TreeFarmer)this.mContainer).maxEU;
+			//this.storedPower = ((CONTAINER_TreeFarmer)this.mContainer).storedEU;			
+		}
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		//this.maxPower = ((CONTAINER_TreeFarmer)this.mContainer).maxEU;
+		//this.storedPower = ((CONTAINER_TreeFarmer)this.mContainer).storedEU;
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
new file mode 100644
index 0000000000..2e1f76f362
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
@@ -0,0 +1,73 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.lib.CORE;
+
+
+public class GUI_IndustrialCentrifuge extends GT_GUIContainerMetaTile_Machine {
+
+	String mName = "";
+	private short counter = 0;
+
+	public GUI_IndustrialCentrifuge(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aTextureFile) {
+		super(new CONTAINER_IndustrialCentrifuge(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
+		this.mName = aName;
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString(this.mName, 10, 8, 16448255);
+		if (this.counter >= 100){
+			this.counter = 0;
+		}
+		else {
+			this.counter++;
+		}
+		if (this.mContainer != null) {
+			if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 1) != 0) {
+				this.fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
+			}
+			if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 2) != 0) {
+				this.fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
+			}
+			if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 4) != 0) {
+				this.fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
+			}
+			if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 8) != 0) {
+				this.fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
+			}
+			if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 32) != 0) {
+				this.fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
+			}
+			if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 64) != 0) {
+				this.fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+			}
+
+			if (((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode == 0) {
+				if (((CONTAINER_IndustrialCentrifuge) this.mContainer).mActive == 0) {
+					this.fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255);
+					this.fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255);
+					this.fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255);
+				} else {
+					this.fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
+					/*if (CORE.DEBUG){
+						fontRendererObj.drawString("Debug Counter: "+counter, 10, 56, 16448255);
+					}*/
+				}
+			}
+		}
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
new file mode 100644
index 0000000000..b44ad916b7
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
@@ -0,0 +1,32 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.lib.CORE;
+
+public class GUI_IronBlastFurnace
+extends GT_GUIContainerMetaTile_Machine {
+	public GUI_IronBlastFurnace(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(new CONTAINER_IronBlastFurnace(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI+"IronBlastFurnace.png");
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString("Iron Blast Furnace", 8, 4, 4210752);
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+		if ((this.mContainer != null) &&
+				(this.mContainer.mProgressTime > 0)) {
+			this.drawTexturedModalRect(x + 58, y + 28, 176, 0, Math.max(0, Math.min(20, 1 + ((this.mContainer.mProgressTime * 20) / (this.mContainer.mMaxProgressTime < 1 ? 1 : this.mContainer.mMaxProgressTime)))), 11);
+		}
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java
new file mode 100644
index 0000000000..95bde9fd9f
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java
@@ -0,0 +1,81 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.lib.CORE;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The GUI-Container I use for all my Basic Machines
+ * <p/>
+ * As the NEI-RecipeTransferRect Handler can't handle one GUI-Class for all GUIs I needed to produce some dummy-classes which extend this class
+ */
+public class GUI_MatterFab extends GT_GUIContainerMetaTile_Machine {
+
+	String mName = "";
+	int uuaUsed = 0;
+	int uumMade = 0;
+
+	public GUI_MatterFab(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aTextureFile) {
+		super(new CONTAINER_MatterFab(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
+		this.mName = aName;
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString(this.mName, 10, 8, 16448255);
+
+
+
+		if (this.mContainer != null) {
+			if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 1) != 0) {
+				this.fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
+			}
+			if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 2) != 0) {
+				this.fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
+			}
+			if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 4) != 0) {
+				this.fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
+			}
+			if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 8) != 0) {
+				this.fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
+			}
+			if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 16) != 0) {
+				this.fontRendererObj.drawString("Circuitry burned out.", 10, 48, 16448255);
+			}
+			if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 32) != 0) {
+				this.fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
+			}
+			if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 64) != 0) {
+				this.fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+			}
+
+			if (((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode == 0) {
+				if (((CONTAINER_MatterFab) this.mContainer).mActive == 0) {
+					this.fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255);
+					this.fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255);
+					this.fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255);
+				} else {
+					this.uuaUsed = ((CONTAINER_MatterFab) this.mContainer).mUUA_USED;
+					this.uumMade = ((CONTAINER_MatterFab) this.mContainer).mUUM_MADE;
+					this.fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
+					this.fontRendererObj.drawString("UU-Amplifier Used: "+this.uuaUsed, 10, 24, 16448255);
+					this.fontRendererObj.drawString("UU-Matter Fabricated: "+this.uumMade, 10, 32, 16448255);
+				}
+			}
+		}
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
new file mode 100644
index 0000000000..c78e7789b8
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
@@ -0,0 +1,296 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The GUI-Container I use for all my Basic Machines
+ * <p/>
+ * As the NEI-RecipeTransferRect Handler can't handle one GUI-Class for all GUIs I needed to produce some dummy-classes which extend this class
+ */
+public class GUI_MultiMachine extends GT_GUIContainerMetaTile_Machine {
+
+	private final static Materials GOOD;
+	private final static Materials BAD;
+	private final String mName;
+
+	private final static ConcurrentHashMap<String, ItemStack> mToolStacks = new ConcurrentHashMap<String, ItemStack>();
+
+	//net.minecraft.client.gui.inventory.GuiContainer.drawItemStack(ItemStack, int, int, String)
+	private final static Method mDrawItemStack;
+
+	static {
+		GOOD = Materials.Uranium;
+		BAD = Materials.Plutonium;
+
+		//net.minecraft.client.gui.inventory.GuiContainer.drawItemStack(ItemStack, int, int, String)
+		mDrawItemStack = ReflectionUtils.getMethod(GuiContainer.class, "drawItemStack", new Class[] {ItemStack.class, int.class, int.class, String.class});
+	}
+
+	public GUI_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aTextureFile) {
+		super(new CONTAINER_MultiMachine_NoPlayerInventory(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
+		this.mName = aName != null ? aName : "";
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {	
+		if (this.mContainer != null) {
+			drawGuiInfoTextLayer(par1, par2);
+			drawGuiRepairStatusLayer(par1, par2);
+		}
+	}
+
+
+	protected void drawGuiInfoTextLayer(final float par1, final int par2) {
+
+		if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 64) != 0) {
+			this.fontRendererObj.drawString(mName, 6, 7, 16448255); // Move down 8px
+			this.fontRendererObj.drawString("Incomplete Structure.", 6, 15, 16448255); // Move down 8px
+		}
+		else {
+			int aTotalTickTime = ((CONTAINER_MultiMachine) this.mContainer).aTotalTickTime;
+			int aMaxParallel = ((CONTAINER_MultiMachine) this.mContainer).aMaxParallel;
+			int aPollutionTick = ((CONTAINER_MultiMachine) this.mContainer).aPollutionTick;
+			int aMaxInputVoltage = ((CONTAINER_MultiMachine) this.mContainer).aMaxInputVoltage;
+			int aInputTier = ((CONTAINER_MultiMachine) this.mContainer).aInputTier;
+			int aOutputTier = ((CONTAINER_MultiMachine) this.mContainer).aOutputTier;
+			int aRecipeDuration = ((CONTAINER_MultiMachine) this.mContainer).aRecipeDuration;
+			int aRecipeEU = ((CONTAINER_MultiMachine) this.mContainer).aRecipeEU;
+			int aRecipeSpecial = ((CONTAINER_MultiMachine) this.mContainer).aRecipeSpecial;
+			int aEfficiency = ((CONTAINER_MultiMachine) this.mContainer).aEfficiency;
+
+			int aPollutionReduction = ((CONTAINER_MultiMachine) this.mContainer).aPollutionReduction;
+
+
+			long aStoredEnergy = ((CONTAINER_MultiMachine) this.mContainer).aStoredEnergy;
+			long aMaxEnergy = ((CONTAINER_MultiMachine) this.mContainer).aMaxEnergy;
+
+			/*
+			 *  Logic Block
+			 */
+
+			long seconds = (aTotalTickTime/20);
+			int weeks = (int) (TimeUnit.SECONDS.toDays(seconds) / 7);
+			int days = (int) (TimeUnit.SECONDS.toDays(seconds) - 7 * weeks);
+			long hours = TimeUnit.SECONDS.toHours(seconds) - TimeUnit.DAYS.toHours(days) - TimeUnit.DAYS.toHours(7*weeks);
+			long minutes = TimeUnit.SECONDS.toMinutes(seconds) - (TimeUnit.SECONDS.toHours(seconds) * 60);
+			long second = TimeUnit.SECONDS.toSeconds(seconds) - (TimeUnit.SECONDS.toMinutes(seconds) *60);
+
+			ArrayList<String> mInfo = new ArrayList<String>();
+
+			String EU = StatCollector.translateToLocal("GTPP.info.eu");
+
+			//GTPP.machines.tier
+
+			mInfo.add(mName);
+
+			if (aInputTier > 0) {
+				mInfo.add(StatCollector.translateToLocal("GTPP.machines.input")+" "+StatCollector.translateToLocal("GTPP.machines.tier")+": "+ EnumChatFormatting.GREEN +GT_Values.VOLTAGE_NAMES[aInputTier]);
+			}
+			if (aOutputTier > 0) {
+				mInfo.add(StatCollector.translateToLocal("GTPP.machines.output")+" "+StatCollector.translateToLocal("GTPP.machines.tier")+": "+ EnumChatFormatting.GREEN +GT_Values.VOLTAGE_NAMES[aOutputTier]);
+			}			
+
+			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.progress")+": "+
+					EnumChatFormatting.GREEN + Integer.toString(((CONTAINER_MultiMachine) this.mContainer).mProgressTime/20) + EnumChatFormatting.RESET +" s / "+
+					EnumChatFormatting.YELLOW + Integer.toString(((CONTAINER_MultiMachine) this.mContainer).mMaxProgressTime/20) + EnumChatFormatting.RESET +" s");
+
+
+			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.energy")+": "+
+					EnumChatFormatting.GREEN + Long.toString(aStoredEnergy) + EnumChatFormatting.RESET +" "+EU+" / "+
+					EnumChatFormatting.YELLOW + Long.toString(aMaxEnergy) + EnumChatFormatting.RESET +" "+EU+"");
+
+			if (aRecipeEU != 0 && aRecipeDuration > 0) {
+				mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.usage")+": "+
+						EnumChatFormatting.RED + Integer.toString(-aRecipeEU) + EnumChatFormatting.RESET + " "+EU+"/t");			
+				mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.duration")+": "+
+						EnumChatFormatting.RED + Integer.toString(aRecipeDuration) + EnumChatFormatting.RESET + " ticks");
+				if (aRecipeSpecial > 0) {
+					mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.specialvalue")+": "+
+							EnumChatFormatting.RED + Integer.toString(aRecipeEU) + EnumChatFormatting.RESET + "");
+				}	
+			}		
+
+			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.mei")+": "+
+					EnumChatFormatting.YELLOW+Long.toString(aMaxInputVoltage)+EnumChatFormatting.RESET+ " "+EU+"/t"+EnumChatFormatting.RESET);
+
+			mInfo.add(StatCollector.translateToLocal(StatCollector.translateToLocal("GTPP.machines.tier")+": "+
+					EnumChatFormatting.YELLOW+GT_Values.VN[GT_Utility.getTier(aMaxInputVoltage)]+ EnumChatFormatting.RESET));
+
+			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.efficiency")+": "+ EnumChatFormatting.YELLOW+Float.toString(aEfficiency / 100.0F)+EnumChatFormatting.RESET + " %");
+
+			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.pollution")+": "+ EnumChatFormatting.RED + (aPollutionTick*20)+ EnumChatFormatting.RESET+"/sec");
+			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.pollutionreduced")+": "+ EnumChatFormatting.GREEN + aPollutionReduction + EnumChatFormatting.RESET+" %");
+
+			mInfo.add(StatCollector.translateToLocal("GTPP.CC.parallel")+": "+EnumChatFormatting.GREEN+(aMaxParallel)+EnumChatFormatting.RESET);
+
+			mInfo.add("Total Time Since Built: ");
+			mInfo.add("" + EnumChatFormatting.DARK_GREEN + Integer.toString(weeks)+EnumChatFormatting.RESET+" Weeks,");
+			mInfo.add("" + EnumChatFormatting.DARK_GREEN+ Integer.toString(days) +EnumChatFormatting.RESET+ " Days,");
+			mInfo.add("" + EnumChatFormatting.DARK_GREEN+ Long.toString(hours) +EnumChatFormatting.RESET+ " Hours,");
+			mInfo.add("" + EnumChatFormatting.DARK_GREEN+ Long.toString(minutes) +EnumChatFormatting.RESET+ " Minutes,");
+			mInfo.add("" + EnumChatFormatting.DARK_GREEN+ Long.toString(second) +EnumChatFormatting.RESET+ " Seconds");
+
+
+
+			// Machine Name
+			//fontRendererObj.drawString(this.mName, 6, 7, 16448255);
+
+			for (int i=0;i<mInfo.size();i++) {
+				fontRendererObj.drawString(mInfo.get(i), 6, 7+(i*8), 16448255);				
+			}
+
+		}	
+
+
+
+
+	}
+
+
+	protected void drawGuiRepairStatusLayer(final float par1, final int par2) {
+
+		boolean aWrench = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 1) != 0;
+		boolean aScrewdriver = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 2) != 0;
+		boolean aMallet = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 4) != 0;
+		boolean aHammer = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 8) != 0;
+		boolean aSoldering = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 16) != 0;
+		boolean aCrowbar = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 32) != 0;	
+
+		if (mToolStacks.isEmpty()) {
+			// Map Stacks of Repair items
+			aWrench = false;
+			aScrewdriver = false;
+			aMallet = false;
+			aHammer = false;
+			aSoldering = false;
+			aCrowbar = false;				
+			mToolStacks.put(aWrench+"WRENCH", GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, (aWrench ? BAD : GOOD), Materials.Tungsten, null));
+			mToolStacks.put(aCrowbar+"CROWBAR", GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, (aCrowbar ? BAD : GOOD), Materials.Tungsten, null));
+			mToolStacks.put(aHammer+"HARDHAMMER",  GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, (aHammer ? BAD : GOOD), Materials.Tungsten, null));
+			mToolStacks.put(aMallet+"SOFTHAMMER", GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.SOFTHAMMER, 1, (aMallet ? BAD : GOOD), Materials.Tungsten, null));
+			mToolStacks.put(aScrewdriver+"SCREWDRIVER", GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, (aScrewdriver ? BAD : GOOD), Materials.Tungsten, null));
+			mToolStacks.put(aSoldering+"SOLDERING_IRON_LV", GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, (aSoldering ? BAD : GOOD), Materials.Tungsten, null));
+
+			// Map Stacks of valid items
+			aWrench = true;
+			aScrewdriver = true;
+			aMallet = true;
+			aHammer = true;
+			aSoldering = true;
+			aCrowbar = true;
+			mToolStacks.put(aWrench+"WRENCH", GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, (aWrench ? BAD : GOOD), Materials.Tungsten, null));
+			mToolStacks.put(aCrowbar+"CROWBAR", GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, (aCrowbar ? BAD : GOOD), Materials.Tungsten, null));
+			mToolStacks.put(aHammer+"HARDHAMMER",  GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, (aHammer ? BAD : GOOD), Materials.Tungsten, null));
+			mToolStacks.put(aMallet+"SOFTHAMMER", GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.SOFTHAMMER, 1, (aMallet ? BAD : GOOD), Materials.Tungsten, null));
+			mToolStacks.put(aScrewdriver+"SCREWDRIVER", GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, (aScrewdriver ? BAD : GOOD), Materials.Tungsten, null));
+			mToolStacks.put(aSoldering+"SOLDERING_IRON_LV", GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, (aSoldering ? BAD : GOOD), Materials.Tungsten, null));
+
+			ItemStack aGlassPane1 = ItemUtils.getItemStackOfAmountFromOreDict("paneGlassRed", 1);
+			ItemStack aGlassPane2 = ItemUtils.getItemStackOfAmountFromOreDict("paneGlassLime", 1);
+			mToolStacks.put("falseGLASS", aGlassPane1);
+			mToolStacks.put("trueGLASS", aGlassPane2);			
+
+			// Reset vars to real state 
+			aWrench = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 1) != 0;
+			aScrewdriver = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 2) != 0;
+			aMallet = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 4) != 0;
+			aHammer = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 8) != 0;
+			aSoldering = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 16) != 0;
+			aCrowbar = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 32) != 0;	
+
+		}	
+
+		ItemStack aWrenchStack;
+		ItemStack aCrowbarStack;
+		ItemStack aHammerStack;
+		ItemStack aMalletStack;
+		ItemStack aScrewdriverStack;
+		ItemStack aSolderingStack;	
+		if (!mToolStacks.isEmpty() && mDrawItemStack != null) {
+
+			aWrenchStack = mToolStacks.get(aWrench + "WRENCH");
+			aCrowbarStack = mToolStacks.get(aCrowbar + "CROWBAR");
+			aHammerStack = mToolStacks.get(aHammer + "HARDHAMMER");
+			aMalletStack = mToolStacks.get(aMallet + "SOFTHAMMER");
+			aScrewdriverStack = mToolStacks.get(aScrewdriver + "SCREWDRIVER");
+			aSolderingStack = mToolStacks.get(aSoldering + "SOLDERING_IRON_LV");
+
+			try {
+
+				ItemStack[] aToolStacks2 = new ItemStack[] {
+						aWrenchStack, aCrowbarStack,
+						aHammerStack, aMalletStack,
+						aScrewdriverStack, aSolderingStack };
+
+				int aIndex = 0;
+				//Draw Repair status tools
+				for (aIndex = 0; aIndex < 6; aIndex++) {
+					int x = 156;
+					int y = 112 - (18 * 3) + (aIndex * 18);
+					mDrawItemStack.invoke(this,
+							new Object[] {
+									aToolStacks2[aIndex] != null ? aToolStacks2[aIndex]
+											: ItemUtils.getErrorStack(1, "Bad Times"),
+											x, y, "" + (aIndex == 2 ? "H" : aIndex == 3 ? "M" : "") // Stacksize Overlay
+					});
+					//this.fontRendererObj.drawString("", 10, 64, 16448255);
+				}
+
+				//Draw Running status
+				boolean running = ((CONTAINER_MultiMachine) this.mContainer).mActive != 0;
+				ItemStack aGlassPane = mToolStacks.get(running+"GLASS");
+
+				if (aGlassPane == null) {
+					aGlassPane = ItemUtils.getItemStackOfAmountFromOreDict("paneGlass" + (running ? "Lime" : "Red"), 1);
+					mToolStacks.put(running+"GLASS", aGlassPane);
+				}
+
+				mDrawItemStack.invoke(this,
+						new Object[] {
+								aGlassPane != null ? aGlassPane
+										: ItemUtils.getErrorStack(1, "Bad Times"),
+										156,
+										112 - (18 * 5),
+										running ? "On" : "Off"}); // Stacksize Overlay
+
+			} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+				e.printStackTrace();
+			}
+		}
+
+
+
+
+	}
+
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java
new file mode 100644
index 0000000000..0cfab4e71e
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java
@@ -0,0 +1,68 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GUI_MultiMachine_Default extends GT_GUIContainerMetaTile_Machine
+{
+    String mName;
+    
+    public GUI_MultiMachine_Default(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aTextureFile) {
+        super(new CONTAINER_MultiMachine(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + ((aTextureFile == null) ? "MultiblockDisplay" : aTextureFile));
+        this.mName = "";
+        this.mName = aName;
+    }
+    
+    @Override
+    protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+        this.fontRendererObj.drawString(this.mName, 10, 8, 16448255);
+        if (this.mContainer != null) {
+            if ((((CONTAINER_MultiMachine)this.mContainer).mDisplayErrorCode & 0x1) != 0x0) {
+                this.fontRendererObj.drawString(this.trans("132", "Pipe is loose."), 10, 16, 16448255);
+            }
+            if ((((CONTAINER_MultiMachine)this.mContainer).mDisplayErrorCode & 0x2) != 0x0) {
+                this.fontRendererObj.drawString(this.trans("133", "Screws are missing."), 10, 24, 16448255);
+            }
+            if ((((CONTAINER_MultiMachine)this.mContainer).mDisplayErrorCode & 0x4) != 0x0) {
+                this.fontRendererObj.drawString(this.trans("134", "Something is stuck."), 10, 32, 16448255);
+            }
+            if ((((CONTAINER_MultiMachine)this.mContainer).mDisplayErrorCode & 0x8) != 0x0) {
+                this.fontRendererObj.drawString(this.trans("135", "Platings are dented."), 10, 40, 16448255);
+            }
+            if ((((CONTAINER_MultiMachine)this.mContainer).mDisplayErrorCode & 0x10) != 0x0) {
+                this.fontRendererObj.drawString(this.trans("136", "Circuitry burned out."), 10, 48, 16448255);
+            }
+            if ((((CONTAINER_MultiMachine)this.mContainer).mDisplayErrorCode & 0x20) != 0x0) {
+                this.fontRendererObj.drawString(this.trans("137", "That doesn't belong there."), 10, 56, 16448255);
+            }
+            if ((((CONTAINER_MultiMachine)this.mContainer).mDisplayErrorCode & 0x40) != 0x0) {
+                this.fontRendererObj.drawString(this.trans("138", "Incomplete Structure."), 10, 64, 16448255);
+            }
+            if (((CONTAINER_MultiMachine)this.mContainer).mDisplayErrorCode == 0) {
+                if (((CONTAINER_MultiMachine)this.mContainer).mActive == 0) {
+                    this.fontRendererObj.drawString(this.trans("139", "Hit with Soft Hammer"), 10, 16, 16448255);
+                    this.fontRendererObj.drawString(this.trans("140", "to (re-)start the Machine"), 10, 24, 16448255);
+                    this.fontRendererObj.drawString(this.trans("141", "if it doesn't start."), 10, 32, 16448255);
+                }
+                else {
+                    this.fontRendererObj.drawString(this.trans("142", "Running perfectly."), 10, 16, 16448255);
+                }
+            }
+        }
+    }
+    
+    public String trans(final String aKey, final String aEnglish) {
+        return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false);
+    }
+    
+    @Override
+    protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        final int x = (this.width - this.xSize) / 2;
+        final int y = (this.height - this.ySize) / 2;
+        this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java
new file mode 100644
index 0000000000..0756effa26
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java
@@ -0,0 +1,88 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.gui.GT_Container_MultiMachine;
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+
+public class GUI_Multi_Basic_Slotted extends GT_GUIContainerMetaTile_Machine {
+	String mName = "";
+
+	public GUI_Multi_Basic_Slotted(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName,
+			String aTextureFile) {
+		super(new GT_Container_MultiMachine(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
+		this.mName = aName;
+	}
+
+	protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+		this.fontRendererObj.drawString(this.mName, 10, 8, 16448255);
+		if (this.mContainer != null) {
+			if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 1) != 0) {
+				this.fontRendererObj.drawString(this.trans("132", "Pipe is loose."), 10, 16, 16448255);
+			}
+
+			if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 2) != 0) {
+				this.fontRendererObj.drawString(this.trans("133", "Screws are missing."), 10, 24, 16448255);
+			}
+
+			if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 4) != 0) {
+				this.fontRendererObj.drawString(this.trans("134", "Something is stuck."), 10, 32, 16448255);
+			}
+
+			if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 8) != 0) {
+				this.fontRendererObj.drawString(this.trans("135", "Platings are dented."), 10, 40, 16448255);
+			}
+
+			if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 16) != 0) {
+				this.fontRendererObj.drawString(this.trans("136", "Circuitry burned out."), 10, 48, 16448255);
+			}
+
+			if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 32) != 0) {
+				this.fontRendererObj.drawString(this.trans("137", "That doesn\'t belong there."), 10, 56, 16448255);
+			}
+
+			if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 64) != 0) {
+				this.fontRendererObj.drawString(this.trans("138", "Incomplete Structure."), 10, 64, 16448255);
+			}
+
+			if (((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode == 0) {
+				if (((GT_Container_MultiMachine) this.mContainer).mActive == 0) {
+					this.fontRendererObj.drawString(this.trans("139", "Hit with Soft Hammer"), 10, 16, 16448255);
+					this.fontRendererObj.drawString(this.trans("140", "to (re-)start the Machine"), 10, 24, 16448255);
+					this.fontRendererObj.drawString(this.trans("141", "if it doesn\'t start."), 10, 32, 16448255);
+				} else {
+					this.fontRendererObj.drawString(this.trans("142", "Running perfectly."), 10, 16, 16448255);
+				}
+
+				ItemStack tItem;
+				if (this.mContainer.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine) {
+					tItem = this.mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
+					if (tItem == null || tItem.getItem() != GT_MetaGenerated_Tool_01.INSTANCE
+							|| tItem.getItemDamage() < 170 || tItem.getItemDamage() > 177) {
+						this.fontRendererObj.drawString(this.trans("144", "Missing Turbine Rotor"), 10,
+								((GT_Container_MultiMachine) this.mContainer).mActive == 0 ? 40 : 24, 16448255);
+					}
+				}
+			}
+		}
+
+	}
+
+	public String trans(String aKey, String aEnglish) {
+		return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false);
+	}
+
+	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		int x = (this.width - this.xSize) / 2;
+		int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java
new file mode 100644
index 0000000000..65ba8610dd
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java
@@ -0,0 +1,175 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.util.GT_Utility;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.IIcon;
+
+import gregtech.api.enums.Textures;
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+
+public class GUI_PowerSubStation extends GT_GUIContainerMetaTile_Machine {
+	public String mNEI;
+	String mName;
+	boolean[] mRepairStatus = new boolean[6];
+	private static IIcon[] mGregToolIcons = new IIcon[6];
+
+	public GUI_PowerSubStation(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aNEI) {
+		super(new CONTAINER_PowerSubStation(aInventoryPlayer, aTileEntity, false), CORE.RES_PATH_GUI + "PowerSubStation.png");
+		this.mName = aName;
+		this.mNEI = aNEI;
+		/** The X size of the inventory window in pixels. */
+		this.xSize = 196;
+		/** The Y size of the inventory window in pixels. */
+		this.ySize = 191;		
+		for (IIcon g : mGregToolIcons) {
+			if (g == null) {
+				getToolTextures();
+			}
+		}		
+	}
+
+	private static final boolean getToolTextures() {
+		mGregToolIcons[0] = Textures.ItemIcons.WRENCH.getIcon();
+		mGregToolIcons[1] = Textures.ItemIcons.HANDLE_SCREWDRIVER.getIcon();
+		mGregToolIcons[2] = Textures.ItemIcons.MORTAR.getIcon();
+		mGregToolIcons[3] = Textures.ItemIcons.JACKHAMMER.getIcon();
+		mGregToolIcons[4] = Textures.ItemIcons.HANDLE_SOLDERING.getIcon();
+		mGregToolIcons[5] = Textures.ItemIcons.CROWBAR.getIcon();		
+		return true;
+	}
+
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString(this.mName, 8, -10, 16448255);
+		if (this.mContainer != null) {	
+
+			this.fontRendererObj.drawString("Error Code: "+((CONTAINER_PowerSubStation) this.mContainer).mDisplayErrorCode, 10, 142, 16448255);
+
+			this.fontRendererObj.drawString("In", 178, 10, 16448255);
+			this.fontRendererObj.drawString("Out", 176, 28, 16448255);
+			
+			if (((this.mContainer).mDisplayErrorCode & 1) != 0) {
+				this.fontRendererObj.drawString("Pipe is loose.", 10, 8, 16448255);
+				mRepairStatus[0] = false;
+			}
+			else {
+				mRepairStatus[0] = true;
+			}			
+			if ((((CONTAINER_PowerSubStation) this.mContainer).mDisplayErrorCode & 2) != 0) {
+				this.fontRendererObj.drawString("Screws are missing.", 10, 16, 16448255);
+				mRepairStatus[1] = false;
+			}
+			else {
+				mRepairStatus[1] = true;
+			}		
+			if ((((CONTAINER_PowerSubStation) this.mContainer).mDisplayErrorCode & 4) != 0) {
+				this.fontRendererObj.drawString("Something is stuck.", 10, 24, 16448255);
+				mRepairStatus[2] = false;
+			}
+			else {
+				mRepairStatus[2] = true;
+			}			
+			if ((((CONTAINER_PowerSubStation) this.mContainer).mDisplayErrorCode & 8) != 0) {
+				this.fontRendererObj.drawString("Platings are dented.", 10, 32, 16448255);
+				mRepairStatus[3] = false;
+			}
+			else {
+				mRepairStatus[3] = true;
+			}		
+			if ((((CONTAINER_PowerSubStation) this.mContainer).mDisplayErrorCode & 16) != 0) {
+				this.fontRendererObj.drawString("Circuitry burned out.", 10, 40, 16448255);
+				mRepairStatus[4] = false;
+			}
+			else {
+				mRepairStatus[4] = true;
+			}			
+			if ((((CONTAINER_PowerSubStation) this.mContainer).mDisplayErrorCode & 32) != 0) {
+				this.fontRendererObj.drawString("That doesn't belong there.", 10, 48, 16448255);
+				mRepairStatus[5] = false;
+			}
+			else {
+				mRepairStatus[5] = true;
+			}			
+			if (((CONTAINER_PowerSubStation) this.mContainer).mDisplayErrorCode == 0) {
+				if (((CONTAINER_PowerSubStation) this.mContainer).mActive == 0) {
+					this.fontRendererObj.drawString(
+							"Hit with Soft Hammer to (re-)start the Machine if it doesn't start.", -70, 8, 16448255);
+				} else {
+					this.fontRendererObj.drawString("Running perfectly.", 10, 8, 16448255);
+				}
+			}
+			if (this.mContainer.mEnergy > 160000000 && this.mContainer.mEnergy < 160010000) {
+				this.fontRendererObj.drawString("160,000,000 EU", 50, 155, 16711680);
+			} else if (this.mContainer.mEnergy > 320000000 && this.mContainer.mEnergy < 320010000) {
+				this.fontRendererObj.drawString("320,000,000 EU", 50, 155, 16711680);
+			} else if (this.mContainer.mEnergy > 640000000 && this.mContainer.mEnergy < 640010000) {
+				this.fontRendererObj.drawString("640,000,000 EU", 50, 155, 16711680);
+			} else {
+				this.fontRendererObj.drawString(GT_Utility.formatNumbers((long) this.mContainer.mEnergy) + " EU", 
+						50,	155, 16711680);
+			}
+		}
+	}
+
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {		
+		/** The X size of the inventory window in pixels. */
+		if (this.xSize != 196)
+			this.xSize = 196;
+		/** The Y size of the inventory window in pixels. */
+		if (this.ySize != 191)
+			this.ySize = 191;		
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);		
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+		if (this.mContainer != null) {
+			final double tScale = this.mContainer.mEnergy / this.mContainer.mStorage;
+			this.drawTexturedModalRect(x + 5, y + 156, 0, 251, Math.min(147, (int) (tScale * 148.0)), 5);
+
+
+			//A1
+			this.drawTexturedModalRect(x + 154, y + 76, 238, (!mRepairStatus[0] ? 0 : 18), 18, 18);
+			//A2
+			this.drawTexturedModalRect(x + 154 + 20, y + 76, 238, (!mRepairStatus[1] ? 0 : 18), 18, 18);
+			//B1
+			this.drawTexturedModalRect(x + 154, y + 76 + 18, 238, (!mRepairStatus[2] ? 0 : 18), 18, 18);
+			//B2
+			this.drawTexturedModalRect(x + 154 + 20, y + 76 + 18, 238, (!mRepairStatus[3] ? 0 : 18), 18, 18);
+			//C1
+			this.drawTexturedModalRect(x + 154, y + 76 + 36, 238, (!mRepairStatus[4] ? 0 : 18), 18, 18);
+			//C2
+			this.drawTexturedModalRect(x + 154 + 20, y + 76 + 36, 238, (!mRepairStatus[5] ? 0 : 18), 18, 18);
+
+
+			if (mGregToolIcons[0] != null) {
+				//this.drawTexturedModelRectFromIcon(x + 154, y + 76, mGregToolIcons[0], 18, 18);
+			}
+			if (mGregToolIcons[1] != null) {
+				//this.drawTexturedModelRectFromIcon(x + 154 + 20, y + 76, mGregToolIcons[1], 18, 18);
+			}
+			if (mGregToolIcons[2] != null) {
+				//this.drawTexturedModelRectFromIcon(x + 154, y + 76 + 18, mGregToolIcons[2], 9, 9);
+			}
+			if (mGregToolIcons[3] != null) {
+				//this.drawTexturedModelRectFromIcon(x + 154 + 20, y + 76 + 18, mGregToolIcons[3], 9, 9);
+			}
+			if (mGregToolIcons[4] != null) {
+				//this.drawTexturedModelRectFromIcon(x + 154, y + 76 + 36, mGregToolIcons[4], 9, 9);
+			}
+			if (mGregToolIcons[5] != null) {
+				//this.drawTexturedModelRectFromIcon(x + 154 + 20, y + 76 + 36, mGregToolIcons[5], 9, 9);
+			}
+
+			/*//Maint Done
+			this.drawTexturedModalRect(x + 154, y + 76, 238, 0, 18, 18);
+			//Maint Required
+			this.drawTexturedModalRect(x + 154 + 20, y + 76, 238, 18, 18, 18);*/
+
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java
new file mode 100644
index 0000000000..c18d58b4b6
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java
@@ -0,0 +1,51 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.lib.CORE;
+
+public class GUI_SafeBlock
+extends GT_GUIContainerMetaTile_Machine {
+	public GUI_SafeBlock(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(new CONTAINER_SafeBlock(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + "SafeBlock.png");
+	}
+
+	//String UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID.toString();
+	boolean blockStatus = ((CONTAINER_SafeBlock)this.mContainer).blockStatus;
+	//String tempPlayer;
+
+	private void updateVars(){
+		//UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID;
+		this.blockStatus = ((CONTAINER_SafeBlock)this.mContainer).blockStatus;
+		// tempPlayer = PlayerCache.lookupPlayerByUUID(UUID);
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2)
+	{
+		this.updateVars();
+		//this.fontRendererObj.drawString("Owner: "+ tempPlayer, 64, 72, 4210752);
+		//this.fontRendererObj.drawString(": "+ UUID.toLowerCase(), 44, 82, 4210752);
+		this.fontRendererObj.drawString("Safe Status", 76, 61, 4210752);
+		if (this.blockStatus){
+			this.fontRendererObj.drawString("Locked", 88, 73, 4210752);
+		}
+		else {
+			this.fontRendererObj.drawString("Unlocked", 82, 73, 4210752);
+		}
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+		/*String UUID = ((CONTAINER_SafeBlock)this.mContainer).UUID;
+        this.fontRendererObj.drawString("Owner UUID: "+ UUID, 8, 12, 4210752);*/
+
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java
new file mode 100644
index 0000000000..f0b3a0c879
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java
@@ -0,0 +1,44 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class GUI_SolarGenerator
+extends GT_GUIContainerMetaTile_Machine {
+	public GUI_SolarGenerator(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aTextureName) {
+		super(new CONTAINER_SolarGenerator(aInventoryPlayer, aTileEntity), "gregtech:textures/gui/" + aTextureName);
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString("Solar Generator", 8, 4, 4210752);
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+		if (this.mContainer != null) {
+			int tScale = ((CONTAINER_SolarGenerator) this.mContainer).mProcessingEnergy;
+			if (tScale > 0) {
+				this.drawTexturedModalRect(x + 70, (y + 25 + 54) - tScale, 194, 54 - tScale, 10, tScale);
+			}
+			tScale = ((CONTAINER_SolarGenerator) this.mContainer).mEnergy;
+			if (tScale > 0) {
+				this.drawTexturedModalRect(x + 83, (y + 25 + 54) - tScale, 204, 54 - tScale, 10, tScale);
+			}
+			tScale = ((CONTAINER_SolarGenerator) this.mContainer).mTemperature;
+			if (tScale > 0) {
+				this.drawTexturedModalRect(x + 96, (y + 25 + 54) - tScale, 214, 54 - tScale, 10, tScale);
+			}
+			tScale = ((CONTAINER_SolarGenerator) this.mContainer).mProcessingEnergy;
+			if (tScale > 0) {
+				this.drawTexturedModalRect(x + 117, (y + 44 + 14) - tScale, 177, 14 - tScale, 15, tScale + 1);
+			}
+		}
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java
new file mode 100644
index 0000000000..88a3e00bb5
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java
@@ -0,0 +1,56 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.preloader.CORE_Preloader;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine
+{
+	long tickTime = 0;
+
+	public GUI_SteamCondenser(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aTextureName)
+	{
+		super(new CONTAINER_SteamCondenser(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + aTextureName);
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2)
+	{
+		this.fontRendererObj.drawString("Condenser", 8, 4, 4210752);
+		if (CORE_Preloader.DEBUG_MODE){
+			this.tickTime = ((CONTAINER_SteamCondenser)this.mContainer).mTickingTime;
+			this.fontRendererObj.drawString("Tick Time: "+this.tickTime, 8, 12, 4210752);
+		}
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3)
+	{
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+		if (this.mContainer != null)
+		{
+
+			int tScale = ((CONTAINER_SteamCondenser)this.mContainer).mSteamAmount;
+			if (tScale > 0) {
+				this.drawTexturedModalRect(x + 70, (y + 25 + 54) - tScale, 194, 54 - tScale, 10, tScale);
+			}
+			tScale = ((CONTAINER_SteamCondenser)this.mContainer).mWaterAmount;
+			if (tScale > 0) {
+				this.drawTexturedModalRect(x + 83, (y + 25 + 54) - tScale, 204, 54 - tScale, 10, tScale);
+			}
+			tScale = ((CONTAINER_SteamCondenser)this.mContainer).mTemperature;
+			if (tScale > 0) {
+				this.drawTexturedModalRect(x + 96, (y + 25 + 54) - tScale, 214, 54 - tScale, 10, tScale);
+			}
+			tScale = ((CONTAINER_SteamCondenser)this.mContainer).mProcessingEnergy;
+			if (tScale > 0) {
+				this.drawTexturedModalRect(x + 115, y + 44 + 2/* - tScale*/, 177, 14 - tScale, 15, 1+tScale);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java
new file mode 100644
index 0000000000..d324c50dd0
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java
@@ -0,0 +1,38 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.StatCollector;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Utility;
+
+public class GUI_SuperChest extends GT_GUIContainerMetaTile_Machine {
+	private final String mName;
+
+	public GUI_SuperChest(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity,
+			String aName) {
+		super(new CONTAINER_SuperChest(aInventoryPlayer, aTileEntity), "gregtech:textures/gui/BasicTank.png");
+		this.mName = aName;
+	}
+
+	protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+		this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2,
+				4210752);
+		this.fontRendererObj.drawString(this.mName, 8, 6, 4210752);
+		if (this.mContainer != null) {
+			this.fontRendererObj.drawString("Item Amount", 10, 20, 16448255);
+			this.fontRendererObj.drawString(
+					GT_Utility.parseNumberToString(((CONTAINER_SuperChest) this.mContainer).mContent), 10, 30,
+					16448255);
+		}
+
+	}
+
+	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		int x = (this.width - this.xSize) / 2;
+		int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java
new file mode 100644
index 0000000000..b236b0ff32
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java
@@ -0,0 +1,46 @@
+
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.lib.CORE;
+
+public class GUI_TreeFarmer extends GT_GUIContainerMetaTile_Machine {
+
+	String mName = "";
+	long maxPower = 0;
+	long storedPower = 0;
+
+	public GUI_TreeFarmer(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aTextureFile) {
+		super(new CONTAINER_TreeFarmer(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
+		this.mName = aName;
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString(this.mName, 64, 6, 16448255);
+		if (this.mContainer != null) {
+			this.maxPower = ((CONTAINER_TreeFarmer)this.mContainer).maxEU;
+			this.storedPower = ((CONTAINER_TreeFarmer)this.mContainer).storedEU;
+			if (((CONTAINER_TreeFarmer) this.mContainer).mDisplayErrorCode == 0) {
+				this.fontRendererObj.drawString("Current Power: "+this.storedPower+"EU", 8, 52, 16448255);
+				this.fontRendererObj.drawString("Max Power: "+this.maxPower+"EU", 8, 60, 16448255);
+				this.fontRendererObj.drawString("Current operations left: "+(this.storedPower/32), 8, 68, 16448255);
+			}
+		}
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		this.maxPower = ((CONTAINER_TreeFarmer)this.mContainer).maxEU;
+		this.storedPower = ((CONTAINER_TreeFarmer)this.mContainer).storedEU;
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java
new file mode 100644
index 0000000000..79d1033bd0
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java
@@ -0,0 +1,105 @@
+package gtPlusPlus.xmod.gregtech.api.gui.basic;
+
+import java.util.Iterator;
+
+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;
+
+import gregtech.api.gui.*;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.slots.SlotPollutionScrubber;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaAtmosphericReconditioner;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The Container I use for all my Basic Machines
+ */
+public class CONTAINER_PollutionCleaner extends GT_Container_BasicTank {
+
+	public boolean mFluidTransfer = false, mItemTransfer = false, mStuttering = false;
+	public int mReduction = 0;
+
+	public CONTAINER_PollutionCleaner(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	@Override
+	public void addSlots(InventoryPlayer aInventoryPlayer) {
+
+		int tStartIndex = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).getInputSlot();
+		int aTier = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mTier;
+
+
+		//Add 2 Item Slots
+		addSlotToContainer(new SlotPollutionScrubber(0, aTier, mTileEntity, tStartIndex++, 53, 25));
+		addSlotToContainer(new SlotPollutionScrubber(1, aTier, mTileEntity, tStartIndex++, 107, 25));   
+		// Upgrade Slot
+		addSlotToContainer(new SlotPollutionScrubber(2, aTier, mTileEntity, tStartIndex++, 125, 63));           	   
+
+	}
+
+	@Override
+	public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
+		Logger.INFO("Clicked on slot "+aSlotIndex);
+		return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+	}
+
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
+
+		mReduction = ((GregtechMetaAtmosphericReconditioner) mTileEntity.getMetaTileEntity()).mPollutionReduction;
+
+		Iterator var2 = this.crafters.iterator();
+		while (var2.hasNext()) {
+			ICrafting var1 = (ICrafting) var2.next();
+			var1.sendProgressBarUpdate(this, 105, mReduction);
+		}
+	}
+
+	@Override
+	public void addCraftingToCrafters(ICrafting par1ICrafting) {
+		super.addCraftingToCrafters(par1ICrafting);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void updateProgressBar(int par1, int par2) {
+		super.updateProgressBar(par1, par2);
+		switch (par1) {			
+			case 105:
+				mReduction = (par2);
+				break;
+		}
+	}
+
+	@Override
+	public int getSlotStartIndex() {
+		return 0;
+	}
+
+	@Override
+	public int getShiftClickStartIndex() {
+		return 0;
+	}
+
+	@Override
+	public int getSlotCount() {
+		return getShiftClickSlotCount();
+	}
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 3;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java
new file mode 100644
index 0000000000..7a9417eeb6
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java
@@ -0,0 +1,65 @@
+package gtPlusPlus.xmod.gregtech.api.gui.basic;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GUI_PollutionCleaner extends GT_GUIContainerMetaTile_Machine {
+	public final String mName;
+	public final String mNEI;
+	public final byte mProgressBarDirection;
+	public final byte mProgressBarAmount;
+	public int mReduction;
+
+	public GUI_PollutionCleaner(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+			final String aName, final String aTextureFile) {
+		this(aInventoryPlayer, aTileEntity, aName, aTextureFile, "PollutionCleaner",(byte) 0, (byte) 1);
+	}
+
+	public GUI_PollutionCleaner(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+			final String aName, final String aTextureFile, final String aNEI, final byte aProgressBarDirection,
+			final byte aProgressBarAmount) {
+		super(new CONTAINER_PollutionCleaner(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + "PollutionCleaner.png");
+		this.mProgressBarDirection = aProgressBarDirection;
+		this.mProgressBarAmount = (byte) Math.max(1, aProgressBarAmount);
+		this.mName = aName;
+		this.mNEI = aNEI;
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString(this.mName, 8, 4, 4210752);
+		this.drawTooltip(par1, par2);
+	}
+
+	private void drawTooltip(final int x2, final int y2) {
+		final int xStart = (this.width - this.xSize) / 2;
+		final int yStart = (this.height - this.ySize) / 2;
+		final int x3 = x2 - xStart;
+		final int y3 = y2 - yStart + 5;
+		final List<String> list = new ArrayList<String>();
+		if (y3 >= 67 && y3 <= 84) {			
+			if (x3 >= 77 && x3 <= 95) {					
+				//Do Dumb shit				
+				CONTAINER_PollutionCleaner aContainerCast = (CONTAINER_PollutionCleaner) this.mContainer;				
+				mReduction = aContainerCast.mReduction;
+				list.add("Reduction: "+mReduction);	
+			}
+		}
+		if (!list.isEmpty()) {
+			this.drawHoveringText(list, x3, y3, this.fontRendererObj);
+		}
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java
new file mode 100644
index 0000000000..cdca065e60
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java
@@ -0,0 +1,184 @@
+package gtPlusPlus.xmod.gregtech.api.gui.fluidreactor;
+
+import java.util.Iterator;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.gui.GT_Container_BasicMachine;
+import gregtech.api.gui.GT_Slot_Render;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.slots.SlotChemicalPlantInput;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.slots.SlotNoInputLogging;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_ChemicalReactor;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.item.ItemStack;
+
+public class Container_FluidReactor extends GT_Container_BasicMachine {
+
+	public boolean mFluidTransfer_1 = false;
+	public boolean mFluidTransfer_2 = false;
+	public boolean oFluidTransfer_1 = false;
+	public boolean oFluidTransfer_2 = false;
+
+	public Container_FluidReactor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	@Override
+	public void addSlots(InventoryPlayer aInventoryPlayer) {		
+
+		// Gui Buttons
+		this.addSlotToContainer(new SlotNoInput(this.mTileEntity, 0, 8, 63)); // Fluid 1
+		this.addSlotToContainer(new SlotNoInput(this.mTileEntity, 1, 44, 63));	
+		this.addSlotToContainer(new SlotNoInput(this.mTileEntity, 2, 26, 63));	// Fluid 2
+
+		int tStartIndex = 3;
+		// Input Slots
+		this.addSlotToContainer(new SlotChemicalPlantInput(this.mTileEntity, tStartIndex++, 8, 7));
+		this.addSlotToContainer(new SlotChemicalPlantInput(this.mTileEntity, tStartIndex++, 26, 7));
+		this.addSlotToContainer(new SlotChemicalPlantInput(this.mTileEntity, tStartIndex++, 44, 7));
+		this.addSlotToContainer(new SlotChemicalPlantInput(this.mTileEntity, tStartIndex++, 62, 7));		
+
+		// Output Slots
+		this.addSlotToContainer(new SlotNoInput(this.mTileEntity, tStartIndex++, 107, 16));
+		this.addSlotToContainer(new SlotNoInput(this.mTileEntity, tStartIndex++, 125, 16));
+		this.addSlotToContainer(new SlotNoInput(this.mTileEntity, tStartIndex++, 107, 34));
+		this.addSlotToContainer(new SlotNoInput(this.mTileEntity, tStartIndex++, 125, 34));	
+
+		// Cell Collector Slot
+		this.addSlotToContainer(new SlotNoInput(this.mTileEntity, tStartIndex++, 116, 63));	
+
+
+		// Inputs Fluids
+		this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, tStartIndex++, 8, 42));
+		this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, tStartIndex++, 26, 42));
+		this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, tStartIndex++, 44, 42));
+		this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, tStartIndex++, 62, 42));
+
+		// Output Fluids
+		this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, tStartIndex++, 143, 16));
+		this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, tStartIndex++, 143, 34));
+
+
+
+
+	}
+
+	public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
+		if (aSlotIndex == 0 || aSlotIndex == 2) {
+			if (this.mTileEntity != null && this.mTileEntity.isServerSide()) {
+				try {
+					final IMetaTileEntity aMetaTileEntity = this.mTileEntity.getMetaTileEntity();
+					if (aMetaTileEntity == null) {
+						return null;
+					}
+					if (aMetaTileEntity instanceof GregtechMetaTileEntity_ChemicalReactor) {
+						//Set Tile
+						if (aSlotIndex == 0) {
+							((GregtechMetaTileEntity_ChemicalReactor)aMetaTileEntity).mFluidTransfer_1 = !((GregtechMetaTileEntity_ChemicalReactor)aMetaTileEntity).mFluidTransfer_1;
+						}
+						else if (aSlotIndex == 2) {
+							((GregtechMetaTileEntity_ChemicalReactor)aMetaTileEntity).mFluidTransfer_2 = !((GregtechMetaTileEntity_ChemicalReactor)aMetaTileEntity).mFluidTransfer_2;
+						}
+						return null;						
+					}
+				}
+				catch (Throwable t) {
+					t.printStackTrace();
+				}
+			}	
+		}
+		//Logger.INFO("Clicked slot "+aSlotIndex);
+		return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);			
+	}
+
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if (this.mTileEntity != null && this.mTileEntity.isServerSide()) {
+			try {
+				Iterator var2 = this.crafters.iterator();
+				final IMetaTileEntity aMetaTileEntity = this.mTileEntity.getMetaTileEntity();
+				if (aMetaTileEntity == null) {
+					Logger.INFO("bad");
+					return;
+				}
+				if (aMetaTileEntity instanceof GregtechMetaTileEntity_ChemicalReactor) {
+					//Read from Tile
+					this.mFluidTransfer_1 = ((GregtechMetaTileEntity_ChemicalReactor)aMetaTileEntity).mFluidTransfer_1;
+					this.mFluidTransfer_2 = ((GregtechMetaTileEntity_ChemicalReactor)aMetaTileEntity).mFluidTransfer_2;	
+					int mTimer;
+					mTimer = (int) ReflectionUtils.getField(this.getClass(), "mTimer").get(this);
+					while (true) {
+						ICrafting var1;
+						do {
+							if (!var2.hasNext()) {
+								this.oFluidTransfer_1 = this.mFluidTransfer_1;
+								this.oFluidTransfer_2 = this.mFluidTransfer_2;
+								return;
+							}
+							var1 = (ICrafting) var2.next();
+							if (mTimer % 500 == 10 || this.oFluidTransfer_1 != this.mFluidTransfer_1) {
+								var1.sendProgressBarUpdate(this, -50, this.mFluidTransfer_1 ? 1 : 0);
+							}
+							if (mTimer % 500 == 10 || this.oFluidTransfer_2 != this.mFluidTransfer_2) {
+								var1.sendProgressBarUpdate(this, -51, this.mFluidTransfer_2 ? 1 : 0);
+							}
+						} while (mTimer % 500 != 10);
+					}
+				}
+				else {
+					Logger.INFO("bad cast");					
+				}
+			}
+			catch (IllegalArgumentException | IllegalAccessException e) {
+				e.printStackTrace();
+			}
+		}	
+
+	}
+
+	public void addCraftingToCrafters(ICrafting par1ICrafting) {
+		super.addCraftingToCrafters(par1ICrafting);
+	}
+
+	@SideOnly(Side.CLIENT)
+	public void updateProgressBar(int par1, int par2) {
+		if (par1 > 0) {
+			super.updateProgressBar(par1, par2);			
+		}
+		else {
+			switch (par1) {
+				case -50 :
+					this.mFluidTransfer_1 = par2 != 0;
+					break;
+				case -51 :
+					this.mFluidTransfer_2 = par2 != 0;
+					break;
+				default :
+					break;
+			}
+		}		
+	}
+
+	public int getSlotStartIndex() {
+		return 3;
+	}
+
+	public int getShiftClickStartIndex() {
+		return 3;
+	}
+
+	public int getSlotCount() {
+		return this.getShiftClickSlotCount() + 5 + 2;
+	}
+
+	public int getShiftClickSlotCount() {
+		return 4;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/GUI_FluidReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/GUI_FluidReactor.java
new file mode 100644
index 0000000000..1be79b40cc
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/GUI_FluidReactor.java
@@ -0,0 +1,122 @@
+package gtPlusPlus.xmod.gregtech.api.gui.fluidreactor;
+
+import gregtech.api.gui.GT_Container_BasicMachine;
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.lib.CORE;
+
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GUI_FluidReactor extends GT_GUIContainerMetaTile_Machine {
+	public final String mName;
+	public final String mNEI;
+	public final byte mProgressBarDirection;
+	public final byte mProgressBarAmount;
+
+	public GUI_FluidReactor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName,
+			String aTextureFile, String aNEI) {
+		this(aInventoryPlayer, aTileEntity, aName, aTextureFile, aNEI, (byte) 0, (byte) 1);
+	}
+
+	public GUI_FluidReactor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName,
+			String aTextureFile, String aNEI, byte aProgressBarDirection, byte aProgressBarAmount) {
+		super(new Container_FluidReactor(aInventoryPlayer, aTileEntity), CORE.MODID+":textures/gui/FluidReactor.png");
+		this.mProgressBarDirection = aProgressBarDirection;
+		this.mProgressBarAmount = (byte) Math.max(1, aProgressBarAmount);
+		this.mName = aName;
+		this.mNEI = aNEI;
+	}
+
+	protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+		this.fontRendererObj.drawString(this.mName, 82, 5, 4210752);
+		this.drawTooltip(par1, par2);
+	}
+
+	private void drawTooltip(int x2, int y2) {
+		int xStart = (this.width - this.xSize) / 2;
+		int yStart = (this.height - this.ySize) / 2;
+		int x = x2 - xStart;
+		int y = y2 - yStart + 5;
+		List<String> list = new ArrayList();
+		if (y >= 67 && y <= 84) {
+			if (x >= 7 && x <= 24) {
+				list.add("Fluid 1 Auto-Output");
+			}
+			if (x >= 25 && x <= 42) {
+				list.add("Fluid 2 Auto-Output");
+			}
+			if (x >= 43 && x <= 61) {
+				list.add("Item Auto-Output");
+			}
+		}
+
+		if (!list.isEmpty()) {
+			this.drawHoveringText(list, x, y, this.fontRendererObj);
+		}
+
+	}
+
+	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		int x = (this.width - this.xSize) / 2;
+		int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+		if (this.mContainer != null) {
+			if (((Container_FluidReactor) this.mContainer).mFluidTransfer_1) {
+				this.drawTexturedModalRect(x + 7, y + 62, 176, 18, 18, 18);
+			}
+			if (((Container_FluidReactor) this.mContainer).mFluidTransfer_2) {
+				this.drawTexturedModalRect(x + 25, y + 62, 194, 18, 18, 18);
+			}
+			if (((GT_Container_BasicMachine) this.mContainer).mItemTransfer) {
+				this.drawTexturedModalRect(x + 43, y + 62, 176, 36, 18, 18);
+			}
+
+			if (((GT_Container_BasicMachine) this.mContainer).mStuttering) {
+				this.drawTexturedModalRect(x + 79, y + 44, 176, 54, 18, 18);
+			}
+
+			if (this.mContainer.mMaxProgressTime > 0) {
+				int tSize = this.mProgressBarDirection < 2 ? 20 : 18;
+				int tProgress = Math
+						.max(1, Math
+								.min(tSize * this.mProgressBarAmount,
+										(this.mContainer.mProgressTime > 0 ? 1 : 0) + this.mContainer.mProgressTime
+												* tSize * this.mProgressBarAmount / this.mContainer.mMaxProgressTime))
+						% (tSize + 1);
+				switch (this.mProgressBarDirection) {
+					case 0 :
+						this.drawTexturedModalRect(x + 82, y + 24, 176, 0, tProgress, 18);
+						break;
+					case 1 :
+						this.drawTexturedModalRect(x + 82 + 20 - tProgress, y + 24, 196 - tProgress, 0, tProgress, 18);
+						break;
+					case 2 :
+						this.drawTexturedModalRect(x + 82, y + 24, 176, 0, 20, tProgress);
+						break;
+					case 3 :
+						this.drawTexturedModalRect(x + 82, y + 24 + 18 - tProgress, 176, 18 - tProgress, 20, tProgress);
+						break;
+					case 4 :
+						tProgress = 20 - tProgress;
+						this.drawTexturedModalRect(x + 82, y + 24, 176, 0, tProgress, 18);
+						break;
+					case 5 :
+						tProgress = 20 - tProgress;
+						this.drawTexturedModalRect(x + 82 + 20 - tProgress, y + 24, 196 - tProgress, 0, tProgress, 18);
+						break;
+					case 6 :
+						tProgress = 18 - tProgress;
+						this.drawTexturedModalRect(x + 82, y + 24, 176, 0, 20, tProgress);
+						break;
+					case 7 :
+						tProgress = 18 - tProgress;
+						this.drawTexturedModalRect(x + 82, y + 24 + 18 - tProgress, 176, 18 - tProgress, 20, tProgress);
+				}
+			}
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java
new file mode 100644
index 0000000000..e6203823b6
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java
@@ -0,0 +1,60 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import gregtech.api.gui.GT_Container_1by1;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class CONTAINER_1by1_Turbine extends GT_Container_1by1 {
+
+    public CONTAINER_1by1_Turbine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new SlotTurbine(mTileEntity, 0, 80, 35));
+    }
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 0;
+	}
+
+	@Override
+	public boolean canDragIntoSlot(Slot par1Slot) {
+		return false;
+	}    
+    
+    public class SlotTurbine extends Slot {
+    	public SlotTurbine(final IInventory inventory, final int x, final int y, final int z) {
+    		super(inventory, x, y, z);
+    	}
+    	@Override
+    	public boolean isItemValid(final ItemStack itemstack) {
+    		if (itemstack.getItem() instanceof GT_MetaGenerated_Tool) {
+    			if (itemstack.getItemDamage() >= 170 && itemstack.getItemDamage() <= 176) {
+    				return true;
+    			}    			
+    		}
+    		return false;
+    	}
+    	@Override
+    	public int getSlotStackLimit() {
+    		return 1;
+    	}
+		@Override
+		public boolean canTakeStack(EntityPlayer p_82869_1_) {
+			return false;
+		}
+		@Override
+		public void putStack(ItemStack p_75215_1_) {
+			// TODO Auto-generated method stub
+			super.putStack(p_75215_1_);
+		}		
+    }    
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java
new file mode 100644
index 0000000000..1d396811c1
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java
@@ -0,0 +1,32 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class CONTAINER_2by2 extends GT_ContainerMetaTile_Machine {
+
+    public CONTAINER_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new Slot(mTileEntity, 0, 71, 26));
+        addSlotToContainer(new Slot(mTileEntity, 1, 89, 26));
+        addSlotToContainer(new Slot(mTileEntity, 2, 71, 44));
+        addSlotToContainer(new Slot(mTileEntity, 3, 89, 44));
+    }
+
+    @Override
+    public int getSlotCount() {
+        return 4;
+    }
+
+    @Override
+    public int getShiftClickSlotCount() {
+        return 4;
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java
new file mode 100644
index 0000000000..8efe60a06e
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java
@@ -0,0 +1,44 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class CONTAINER_4by4 extends GT_ContainerMetaTile_Machine {
+
+    public CONTAINER_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new Slot(mTileEntity, 0, 53, 8));
+        addSlotToContainer(new Slot(mTileEntity, 1, 71, 8));
+        addSlotToContainer(new Slot(mTileEntity, 2, 89, 8));
+        addSlotToContainer(new Slot(mTileEntity, 3, 107, 8));
+        addSlotToContainer(new Slot(mTileEntity, 4, 53, 26));
+        addSlotToContainer(new Slot(mTileEntity, 5, 71, 26));
+        addSlotToContainer(new Slot(mTileEntity, 6, 89, 26));
+        addSlotToContainer(new Slot(mTileEntity, 7, 107, 26));
+        addSlotToContainer(new Slot(mTileEntity, 8, 53, 44));
+        addSlotToContainer(new Slot(mTileEntity, 9, 71, 44));
+        addSlotToContainer(new Slot(mTileEntity, 10, 89, 44));
+        addSlotToContainer(new Slot(mTileEntity, 11, 107, 44));
+        addSlotToContainer(new Slot(mTileEntity, 12, 53, 62));
+        addSlotToContainer(new Slot(mTileEntity, 13, 71, 62));
+        addSlotToContainer(new Slot(mTileEntity, 14, 89, 62));
+        addSlotToContainer(new Slot(mTileEntity, 15, 107, 62));
+    }
+
+    @Override
+    public int getSlotCount() {
+        return 16;
+    }
+
+    @Override
+    public int getShiftClickSlotCount() {
+        return 16;
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_HatchNbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_HatchNbtConsumable.java
new file mode 100644
index 0000000000..9596d41387
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_HatchNbtConsumable.java
@@ -0,0 +1,282 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import java.util.Iterator;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.gui.GT_Container;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.core.slots.SlotNoInput;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class CONTAINER_HatchNbtConsumable extends GT_Container {
+
+	public final int mInputslotCount;
+	private final int mTotalSlotCount;
+	
+    public CONTAINER_HatchNbtConsumable(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, int aInputslotCount) {
+        super(aInventoryPlayer, aTileEntity);
+		mInputslotCount = aInputslotCount;
+		mTotalSlotCount = aInputslotCount*2;
+        mTileEntity = aTileEntity;
+        if (mTileEntity != null && mTileEntity.getMetaTileEntity() != null) {
+            addSlots(aInventoryPlayer);
+            if (doesBindPlayerInventory()) {
+            	bindPlayerInventory(aInventoryPlayer);
+            }
+            detectAndSendChanges();
+        } else {
+            aInventoryPlayer.player.openContainer = aInventoryPlayer.player.inventoryContainer;
+        }
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+    	if (mTotalSlotCount == 8) {    	
+    		final int aSlotYStart = 26;
+    		final int aSlotYFinish = aSlotYStart + (18*2);
+    		final int aSlotXStart1 = 26;
+    		final int aSlotXFinish1 = aSlotXStart1 + (18*2);
+    		final int aSlotXStart2 = 116;
+    		final int aSlotXFinish2 = aSlotXStart2 + (18*2);    	
+    		int aSlotID = 0;
+    		for (int y = aSlotYStart; y < aSlotYFinish; y += 18) {
+    			for (int x = aSlotXStart1; x < aSlotXFinish1; x += 18) {
+    	            addSlotToContainer(new Slot(mTileEntity, aSlotID++, x, y));
+        		}
+    		}
+    		for (int y = aSlotYStart; y < aSlotYFinish; y += 18) {
+    			for (int x = aSlotXStart2; x < aSlotXFinish2; x += 18) {
+    	            addSlotToContainer(new ViewingSlot(mTileEntity, aSlotID++, x, y));
+        		}
+    		} 
+    	}
+    	else if (mTotalSlotCount == 18) {  
+    		int aSlotYStart = 20;
+    		int aSlotYFinish = aSlotYStart + (18*3);
+    		int aSlotXStart1 = 26;
+    		int aSlotXFinish1 = aSlotXStart1 + (18*3);
+    		int aSlotXStart2 = 98;
+    		int aSlotXFinish2 = aSlotXStart2 + (18*3);    		
+    		int aSlotID = 0;
+    		for (int y = aSlotYStart; y < aSlotYFinish; y += 18) {
+    			for (int x = aSlotXStart1; x < aSlotXFinish1; x += 18) {
+    	            addSlotToContainer(new Slot(mTileEntity, aSlotID++, x, y));
+        		}
+    		}
+    		for (int y = aSlotYStart; y < aSlotYFinish; y += 18) {
+    			for (int x = aSlotXStart2; x < aSlotXFinish2; x += 18) {
+    	            addSlotToContainer(new ViewingSlot(mTileEntity, aSlotID++, x, y));
+        		}
+    		}     		
+    	}
+    	else if (mTotalSlotCount == 32) {  
+    		int aSlotYStart = 8;
+    		int aSlotYFinish = aSlotYStart + (18*4);
+    		int aSlotXStart1 = 8;
+    		int aSlotXFinish1 = aSlotXStart1 + (18*4);
+    		int aSlotXStart2 = 97;
+    		int aSlotXFinish2 = aSlotXStart2 + (18*4);    		
+    		int aSlotID = 0;
+    		for (int y = aSlotYStart; y < aSlotYFinish; y += 18) {
+    			for (int x = aSlotXStart1; x < aSlotXFinish1; x += 18) {
+    	            addSlotToContainer(new Slot(mTileEntity, aSlotID++, x, y));
+        		}
+    		}
+    		for (int y = aSlotYStart; y < aSlotYFinish; y += 18) {
+    			for (int x = aSlotXStart2; x < aSlotXFinish2; x += 18) {
+    	            addSlotToContainer(new ViewingSlot(mTileEntity, aSlotID++, x, y));
+        		}
+    		}    		
+    	}        
+    }
+
+    @Override
+    public int getSlotCount() {
+        return mTotalSlotCount;
+    }
+
+    @Override
+    public int getShiftClickSlotCount() {
+        return mInputslotCount;
+    }
+    
+    /*
+     * Uselss stuff copied from GT
+     */
+    
+
+    public int mActive = 0, mMaxProgressTime = 0, mProgressTime = 0, mEnergy = 0, mSteam = 0, mSteamStorage = 0, mStorage = 0, mOutput = 0, mInput = 0, mID = 0, mDisplayErrorCode = 0;
+    private int oActive = 0, oMaxProgressTime = 0, oProgressTime = 0, oEnergy = 0, oSteam = 0, oSteamStorage = 0, oStorage = 0, oOutput = 0, oInput = 0, oID = 0, oDisplayErrorCode = 0, mTimer = 0;
+
+    
+    @Override
+    public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
+        mStorage = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getEUCapacity());
+        mEnergy = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getStoredEU());
+        mSteamStorage = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getSteamCapacity());
+        mSteam = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getStoredSteam());
+        mOutput = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getOutputVoltage());
+        mInput = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getInputVoltage());
+        mDisplayErrorCode = mTileEntity.getErrorDisplayID();
+        mProgressTime = mTileEntity.getProgress();
+        mMaxProgressTime = mTileEntity.getMaxProgress();
+        mActive = mTileEntity.isActive() ? 1 : 0;
+        mTimer++;
+
+        Iterator var2 = this.crafters.iterator();
+        while (var2.hasNext()) {
+            ICrafting var1 = (ICrafting) var2.next();
+            if (mTimer % 500 == 10 || oEnergy != mEnergy) {
+                var1.sendProgressBarUpdate(this, 0, mEnergy & 65535);
+                var1.sendProgressBarUpdate(this, 1, mEnergy >>> 16);
+            }
+            if (mTimer % 500 == 10 || oStorage != mStorage) {
+                var1.sendProgressBarUpdate(this, 2, mStorage & 65535);
+                var1.sendProgressBarUpdate(this, 3, mStorage >>> 16);
+            }
+            if (mTimer % 500 == 10 || oOutput != mOutput) {
+                var1.sendProgressBarUpdate(this, 4, mOutput);
+            }
+            if (mTimer % 500 == 10 || oInput != mInput) {
+                var1.sendProgressBarUpdate(this, 5, mInput);
+            }
+            if (mTimer % 500 == 10 || oDisplayErrorCode != mDisplayErrorCode) {
+                var1.sendProgressBarUpdate(this, 6, mDisplayErrorCode);
+            }
+            if (mTimer % 500 == 10 || oProgressTime != mProgressTime) {
+                var1.sendProgressBarUpdate(this, 11, mProgressTime & 65535);
+                var1.sendProgressBarUpdate(this, 12, mProgressTime >>> 16);
+            }
+            if (mTimer % 500 == 10 || oMaxProgressTime != mMaxProgressTime) {
+                var1.sendProgressBarUpdate(this, 13, mMaxProgressTime & 65535);
+                var1.sendProgressBarUpdate(this, 14, mMaxProgressTime >>> 16);
+            }
+            if (mTimer % 500 == 10 || oID != mID) {
+                var1.sendProgressBarUpdate(this, 15, mID);
+            }
+            if (mTimer % 500 == 10 || oActive != mActive) {
+                var1.sendProgressBarUpdate(this, 16, mActive);
+            }
+            if (mTimer % 500 == 10 || oSteam != mSteam) {
+                var1.sendProgressBarUpdate(this, 17, mSteam & 65535);
+                var1.sendProgressBarUpdate(this, 18, mSteam >>> 16);
+            }
+            if (mTimer % 500 == 10 || oSteamStorage != mSteamStorage) {
+                var1.sendProgressBarUpdate(this, 19, mSteamStorage & 65535);
+                var1.sendProgressBarUpdate(this, 20, mSteamStorage >>> 16);
+            }
+        }
+
+        oID = mID;
+        oSteam = mSteam;
+        oInput = mInput;
+        oActive = mActive;
+        oOutput = mOutput;
+        oEnergy = mEnergy;
+        oStorage = mStorage;
+        oSteamStorage = mSteamStorage;
+        oProgressTime = mProgressTime;
+        oMaxProgressTime = mMaxProgressTime;
+        oDisplayErrorCode = mDisplayErrorCode;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void updateProgressBar(int par1, int par2) {
+        super.updateProgressBar(par1, par2);
+        switch (par1) {
+            case 0:
+                mEnergy = mEnergy & -65536 | par2;
+                break;
+            case 1:
+                mEnergy = mEnergy & 65535 | par2 << 16;
+                break;
+            case 2:
+                mStorage = mStorage & -65536 | par2;
+                break;
+            case 3:
+                mStorage = mStorage & 65535 | par2 << 16;
+                break;
+            case 4:
+                mOutput = par2;
+                break;
+            case 5:
+                mInput = par2;
+                break;
+            case 6:
+                mDisplayErrorCode = par2;
+                break;
+            case 11:
+                mProgressTime = mProgressTime & -65536 | par2;
+                break;
+            case 12:
+                mProgressTime = mProgressTime & 65535 | par2 << 16;
+                break;
+            case 13:
+                mMaxProgressTime = mMaxProgressTime & -65536 | par2;
+                break;
+            case 14:
+                mMaxProgressTime = mMaxProgressTime & 65535 | par2 << 16;
+                break;
+            case 15:
+                mID = par2;
+                break;
+            case 16:
+                mActive = par2;
+                break;
+            case 17:
+                mSteam = mSteam & -65536 | par2;
+                break;
+            case 18:
+                mSteam = mSteam & 65535 | par2 << 16;
+                break;
+            case 19:
+                mSteamStorage = mSteamStorage & -65536 | par2;
+                break;
+            case 20:
+                mSteamStorage = mSteamStorage & 65535 | par2 << 16;
+                break;
+        }
+    }
+
+    @Override
+    public boolean canInteractWith(EntityPlayer player) {
+        return mTileEntity.isUseableByPlayer(player);
+    }
+    
+    public String trans(String aKey, String aEnglish){
+    	return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_"+aKey, aEnglish, false);
+    }
+    
+    private static class ViewingSlot extends SlotNoInput {
+
+		public ViewingSlot(IInventory inventory, int index, int x, int y) {
+			super(inventory, index, x, y);
+		}
+
+		@Override
+		public boolean isItemValid(ItemStack itemstack) {
+			return false;
+		}
+
+		@Override
+		public int getSlotStackLimit() {
+			return 1;
+		}
+
+		@Override
+		public boolean canTakeStack(EntityPlayer p_82869_1_) {
+			return true;
+		}
+    	
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_1by1_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_1by1_Turbine.java
new file mode 100644
index 0000000000..5623f0e224
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_1by1_Turbine.java
@@ -0,0 +1,36 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+
+public class GUI_1by1_Turbine extends GT_GUIContainerMetaTile_Machine {
+
+    private final String mName;
+
+    public GUI_1by1_Turbine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+        super(new CONTAINER_1by1_Turbine(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "1by1.png");
+        mName = aName;
+    }
+    
+    public GUI_1by1_Turbine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+        super(new CONTAINER_1by1_Turbine(aInventoryPlayer, aTileEntity), RES_PATH_GUI + aBackground + "1by1.png");
+        mName = aName;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        fontRendererObj.drawString(mName, 8, 4, 4210752);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java
new file mode 100644
index 0000000000..b427a632f7
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java
@@ -0,0 +1,36 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class GUI_2by2 extends GT_GUIContainerMetaTile_Machine {
+
+    private final String mName;
+
+    public GUI_2by2(CONTAINER_2by2 containerType, InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+        super(containerType, RES_PATH_GUI + "2by2.png");
+        mName = aName;
+    }
+    
+    public GUI_2by2(CONTAINER_2by2 containerType, InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+        super(containerType, RES_PATH_GUI + aBackground + "2by2.png");
+        mName = aName;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        fontRendererObj.drawString(mName, 8, 4, 4210752);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java
new file mode 100644
index 0000000000..aced4342b3
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java
@@ -0,0 +1,36 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class GUI_4by4 extends GT_GUIContainerMetaTile_Machine {
+
+    private final String mName;
+
+    public GUI_4by4(CONTAINER_4by4 containerType, InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+        super(containerType, RES_PATH_GUI + "4by4.png");
+        mName = aName;
+    }
+    
+    public GUI_4by4(CONTAINER_4by4 containerType, InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+        super(containerType, RES_PATH_GUI + aBackground + "4by4.png");
+        mName = aName;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        fontRendererObj.drawString(mName, 8, 4, 4210752);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_HatchNbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_HatchNbtConsumable.java
new file mode 100644
index 0000000000..dd19571646
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_HatchNbtConsumable.java
@@ -0,0 +1,59 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import gregtech.api.gui.GT_GUIContainer;
+
+public class GUI_HatchNbtConsumable extends GT_GUIContainer {
+
+    private final String mName;
+	private final int mTotalSlotCount;
+    public final CONTAINER_HatchNbtConsumable mContainer;
+    
+    public GUI_HatchNbtConsumable(CONTAINER_HatchNbtConsumable aContainer, String aName) {
+    	super(aContainer, RES_PATH_GUI + getTextureForGUI(aContainer.mInputslotCount*2)+".png");
+        mContainer = aContainer;
+        mName = aName;
+		mTotalSlotCount = aContainer.mInputslotCount*2;
+	}
+
+	private static final String getTextureForGUI(int aTotalSlotCOunt) {
+    	if (aTotalSlotCOunt == 18) {
+        	return "HatchNbtConsumable_3By3";    		
+    	}
+    	else if (aTotalSlotCOunt == 32) {
+        	return "HatchNbtConsumable_4By4";    		
+    	}
+    	else {
+        	return "HatchNbtConsumable_2By2";    		
+    	}    	
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    	if (mTotalSlotCount == 18) {
+            fontRendererObj.drawString(mName, 8, 4, 4210752);
+            fontRendererObj.drawString("Stock", 25, 14, 4210752);
+            fontRendererObj.drawString("Active", 115, 14, 4210752);  		
+    	}
+    	else if (mTotalSlotCount == 32) {
+            //fontRendererObj.drawString("Slots: "+mTotalSlotCount, 8, 4, 4210752);
+            //fontRendererObj.drawString(mName, 8, 4, 4210752);
+            //fontRendererObj.drawString("Stock", 25, 16, 4210752);
+            //fontRendererObj.drawString("Active", 115, 16, 4210752);  		
+    	}
+    	else {
+            fontRendererObj.drawString(mName, 8, 4, 4210752);
+            fontRendererObj.drawString("Stock", 25, 16, 4210752);
+            fontRendererObj.drawString("Active", 115, 16, 4210752); 		
+    	}   
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java
new file mode 100644
index 0000000000..00d022c481
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java
@@ -0,0 +1,24 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches.charge;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.slots.SlotElectric;
+import gtPlusPlus.xmod.gregtech.api.gui.hatches.CONTAINER_2by2;
+
+public class CONTAINER_Electric_2by2 extends CONTAINER_2by2{
+
+	public CONTAINER_Electric_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+	
+	@Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new SlotElectric(mTileEntity, 0, 71, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 1, 89, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 2, 71, 44));
+        addSlotToContainer(new SlotElectric(mTileEntity, 3, 89, 44));
+    }
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java
new file mode 100644
index 0000000000..1f833eb3cb
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java
@@ -0,0 +1,37 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches.charge;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.slots.SlotElectric;
+import gtPlusPlus.xmod.gregtech.api.gui.hatches.CONTAINER_4by4;
+
+public class CONTAINER_Electric_4by4 extends CONTAINER_4by4{
+
+	public CONTAINER_Electric_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new SlotElectric(mTileEntity, 0, 53, 8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 1, 71, 8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 2, 89, 8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 3, 107, 8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 4, 53, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 5, 71, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 6, 89, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 7, 107, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 8, 53, 44));
+        addSlotToContainer(new SlotElectric(mTileEntity, 9, 71, 44));
+        addSlotToContainer(new SlotElectric(mTileEntity, 10, 89, 44));
+        addSlotToContainer(new SlotElectric(mTileEntity, 11, 107, 44));
+        addSlotToContainer(new SlotElectric(mTileEntity, 12, 53, 62));
+        addSlotToContainer(new SlotElectric(mTileEntity, 13, 71, 62));
+        addSlotToContainer(new SlotElectric(mTileEntity, 14, 89, 62));
+        addSlotToContainer(new SlotElectric(mTileEntity, 15, 107, 62));
+    }
+	
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java
new file mode 100644
index 0000000000..9be7104bbc
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java
@@ -0,0 +1,21 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches.charge;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.xmod.gregtech.api.gui.hatches.GUI_2by2;
+
+public class GUI_Electric_2by2 extends GUI_2by2{
+
+	public GUI_Electric_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+		super(new CONTAINER_Electric_2by2(aInventoryPlayer, aTileEntity), aInventoryPlayer, aTileEntity, aName);
+	}
+	
+	public GUI_Electric_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+       super(new CONTAINER_Electric_2by2(aInventoryPlayer, aTileEntity), aInventoryPlayer, aTileEntity, RES_PATH_GUI + aBackground + "2by2.png");
+    }
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java
new file mode 100644
index 0000000000..ed3fce5e2c
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java
@@ -0,0 +1,22 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches.charge;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.xmod.gregtech.api.gui.hatches.GUI_4by4;
+
+public class GUI_Electric_4by4 extends GUI_4by4{
+
+	public GUI_Electric_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+		super(new CONTAINER_Electric_4by4(aInventoryPlayer, aTileEntity), aInventoryPlayer, aTileEntity, aName);
+	}
+	
+	public GUI_Electric_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+        super(new CONTAINER_Electric_4by4(aInventoryPlayer, aTileEntity), aInventoryPlayer, aTileEntity, RES_PATH_GUI + aBackground + "4by4.png");
+
+    }
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/CONTAINER_BasicTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/CONTAINER_BasicTank.java
new file mode 100644
index 0000000000..9a58e74ec4
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/CONTAINER_BasicTank.java
@@ -0,0 +1,69 @@
+package gtPlusPlus.xmod.gregtech.api.gui.power;
+
+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 gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.GTPP_MTE_BasicTank;
+
+import java.util.Iterator;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+
+public class CONTAINER_BasicTank extends GT_ContainerMetaTile_Machine {
+	public int mContent = 0;
+
+	public CONTAINER_BasicTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public void addSlots(InventoryPlayer aInventoryPlayer) {
+		this.addSlotToContainer(new Slot(this.mTileEntity, 0, 80, 17));
+		this.addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 1, 80, 53));
+		this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, 2, 59, 42));
+	}
+
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if (!this.mTileEntity.isClientSide() && this.mTileEntity.getMetaTileEntity() != null) {
+			if (((GTPP_MTE_BasicTank) this.mTileEntity.getMetaTileEntity()).mFluid != null) {
+				this.mContent = ((GTPP_MTE_BasicTank) this.mTileEntity.getMetaTileEntity()).mFluid.amount;
+			} else {
+				this.mContent = 0;
+			}
+
+			Iterator var2 = this.crafters.iterator();
+
+			while (var2.hasNext()) {
+				ICrafting var1 = (ICrafting) var2.next();
+				var1.sendProgressBarUpdate(this, 100, this.mContent & '￿');
+				var1.sendProgressBarUpdate(this, 101, this.mContent >>> 16);
+			}
+
+		}
+	}
+
+	@SideOnly(Side.CLIENT)
+	public void updateProgressBar(int par1, int par2) {
+		super.updateProgressBar(par1, par2);
+		switch (par1) {
+			case 100 :
+				this.mContent = this.mContent & -65536 | par2;
+				break;
+			case 101 :
+				this.mContent = this.mContent & '￿' | par2 << 16;
+		}
+
+	}
+
+	public int getSlotCount() {
+		return 2;
+	}
+
+	public int getShiftClickSlotCount() {
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/GUI_BasicTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/GUI_BasicTank.java
new file mode 100644
index 0000000000..a03aac346b
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/GUI_BasicTank.java
@@ -0,0 +1,36 @@
+package gtPlusPlus.xmod.gregtech.api.gui.power;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.StatCollector;
+
+public class GUI_BasicTank extends GT_GUIContainerMetaTile_Machine {
+	private final String mName;
+
+	public GUI_BasicTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+		super(new CONTAINER_BasicTank(aInventoryPlayer, aTileEntity), "gregtech:textures/gui/BasicTank.png");
+		this.mName = aName;
+	}
+
+	protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+		this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2,
+				4210752);
+		this.fontRendererObj.drawString(this.mName, 8, 6, 4210752);
+		if (this.mContainer != null) {
+			this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255);
+			this.fontRendererObj.drawString(
+					GT_Utility.parseNumberToString(((CONTAINER_BasicTank) this.mContainer).mContent), 10, 30,
+					16448255);
+		}
+
+	}
+
+	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+		int x = (this.width - this.xSize) / 2;
+		int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+}
\ No newline at end of file