% Cleaned up tank tooltips.

- Removed all old code now not required by tanks.
- Removed the GT4 workbench classes, favourite my homebrew ones.

15 files changed, 180 insertions, 2089 deletions

diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
index 212e9154be..9ac81bffe4 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.core.block.machine;
 
-import gregtech.api.items.GT_MetaGenerated_Tool;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
@@ -84,12 +83,12 @@ public class Machine_Workbench extends BlockContainer
 			else if (heldItem.getItem() instanceof ITool){
 				holdingWrench = true;
 			}
-			else if (heldItem.getItem() instanceof GT_MetaGenerated_Tool){
+			/*else if (heldItem.getItem() instanceof GT_MetaGenerated_Tool){
 				GT_MetaGenerated_Tool testTool = (GT_MetaGenerated_Tool) heldItem.getItem();
 				if (testTool.canWrench(player, x, y, z)){
 					holdingWrench = true;
 				}
-			}
+			}*/
 			else {
 				holdingWrench = false;
 			}
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
index 46c08c0d4d..ce09ddab59 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.core.block.machine;
 
-import gregtech.api.items.GT_MetaGenerated_Tool;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
@@ -84,12 +83,12 @@ public class Machine_WorkbenchAdvanced extends BlockContainer
 			else if (heldItem.getItem() instanceof ITool){
 				holdingWrench = true;
 			}
-			else if (heldItem.getItem() instanceof GT_MetaGenerated_Tool){
+			/*else if (heldItem.getItem() instanceof GT_MetaGenerated_Tool){
 				GT_MetaGenerated_Tool testTool = (GT_MetaGenerated_Tool) heldItem.getItem();
 				if (testTool.canWrench(player, x, y, z)){
 					holdingWrench = true;
 				}
-			}
+			}*/
 			else {
 				holdingWrench = false;
 			}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedWorkbench.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedWorkbench.java
deleted file mode 100644
index 47c8aedb98..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedWorkbench.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.gui;
-
-import gregtech.api.gui.GT_ContainerMetaTile_Machine;
-import gregtech.api.gui.GT_Slot_Holo;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.slots.SlotGtTool;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_AdvancedCraftingTable;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class CONTAINER_AdvancedWorkbench extends GT_ContainerMetaTile_Machine {
-	
-	public CONTAINER_AdvancedWorkbench(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
-        super(aInventoryPlayer, aTileEntity);
-    }
-
-    public CONTAINER_AdvancedWorkbench(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, boolean bindInventory) {
-        super(aInventoryPlayer, aTileEntity, bindInventory);
-    }
-
-	@Override
-	public void addSlots(InventoryPlayer aInventoryPlayer)
-	{
-		addSlotToContainer(new Slot(mTileEntity, 0, 8, 8));
-		addSlotToContainer(new Slot(mTileEntity, 1, 26, 8));
-		addSlotToContainer(new Slot(mTileEntity, 2, 44, 8));
-		addSlotToContainer(new Slot(mTileEntity, 3, 62, 8));
-		addSlotToContainer(new Slot(mTileEntity, 4, 8, 26));
-		addSlotToContainer(new Slot(mTileEntity, 5, 26, 26));
-		addSlotToContainer(new Slot(mTileEntity, 6, 44, 26));
-		addSlotToContainer(new Slot(mTileEntity, 7, 62, 26));
-		addSlotToContainer(new Slot(mTileEntity, 8, 8, 44));
-		addSlotToContainer(new Slot(mTileEntity, 9, 26, 44));
-		addSlotToContainer(new Slot(mTileEntity, 10, 44, 44));
-		addSlotToContainer(new Slot(mTileEntity, 11, 62, 44));
-		addSlotToContainer(new Slot(mTileEntity, 12, 8, 62));
-		addSlotToContainer(new Slot(mTileEntity, 13, 26, 62));
-		addSlotToContainer(new Slot(mTileEntity, 14, 44, 62));
-		addSlotToContainer(new Slot(mTileEntity, 15, 62, 62));
-
-		addSlotToContainer(new SlotGtTool(mTileEntity, 16, 82, 8));
-		addSlotToContainer(new SlotGtTool(mTileEntity, 17, 100, 8));
-		addSlotToContainer(new SlotGtTool(mTileEntity, 18, 118, 8));
-		addSlotToContainer(new SlotGtTool(mTileEntity, 19, 136, 8));
-		addSlotToContainer(new SlotGtTool(mTileEntity, 20, 154, 8));
-
-		addSlotToContainer(new Slot(mTileEntity, 21, 82, 28));
-		addSlotToContainer(new Slot(mTileEntity, 22, 100, 28));
-		addSlotToContainer(new Slot(mTileEntity, 23, 118, 28));
-		addSlotToContainer(new Slot(mTileEntity, 24, 82, 46));
-		addSlotToContainer(new Slot(mTileEntity, 25, 100, 46));
-		addSlotToContainer(new Slot(mTileEntity, 26, 118, 46));
-		addSlotToContainer(new Slot(mTileEntity, 27, 82, 64));
-		addSlotToContainer(new Slot(mTileEntity, 28, 100, 64));
-		addSlotToContainer(new Slot(mTileEntity, 29, 118, 64));
-
-		addSlotToContainer(new Slot(mTileEntity, 33, 154, 28));
-		addSlotToContainer(new Slot(mTileEntity, 34, 154, 64));
-
-		addSlotToContainer(new Slot(mTileEntity, 30, 136, 28));
-		addSlotToContainer(new GT_Slot_Holo(mTileEntity, 31, 136, 64, false, false, 1));
-		addSlotToContainer(new GT_Slot_Holo(mTileEntity, 32, 154, 46, false, false, 1));
-		addSlotToContainer(new GT_Slot_Holo(mTileEntity, 32, 136, 46, false, false, 1));
-	}
-
-	@Override
-	public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer){
-		Utils.LOG_INFO("Player Clicked A Slot. "+aSlotIndex);
-		if ((aSlotIndex < 21) || (aSlotIndex > 35)) {
-			Utils.LOG_INFO("Returning slotClick for slot: "+aSlotIndex+" on line 75");
-			return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
-		}
-		if ((mTileEntity == null) || (mTileEntity.getMetaTileEntity() == null)) {
-			Utils.LOG_INFO("Returning null on Line 79");
-			return null;
-		}
-		try
-		{
-			ItemStack tStack = ((Slot)this.inventorySlots.get(aSlotIndex)).getStack();
-			if ((tStack != null) && (tStack.stackSize <= 0) && (!GT_Utility.areStacksEqual(tStack, aPlayer.inventory.getItemStack()))) {
-				Utils.LOG_INFO("Returning null on Line 86");
-				return null;
-			}
-			if (aSlotIndex == 32)
-			{
-				if ((aMouseclick == 0) && (aShifthold == 1))
-				{
-					((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).setBluePrint(null);
-					Utils.LOG_INFO("Returning null on Line 94");
-					return null;
-				}
-			}
-			else
-			{
-				if (aSlotIndex == 33)
-				{
-					ItemStack tCraftedStack = ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).getCraftingOutput();
-					if (tCraftedStack != null) {
-						if (aShifthold == 1)
-						{
-							for (byte i = 0; i < aPlayer.inventory.mainInventory.length; i = (byte)(i + 1)) {
-								for (byte j = 0; (j < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize) && (((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).canDoCraftingOutput()); j = (byte)(j + 1))
-								{
-									ItemStack tStack2;
-									if ((!GT_Utility.areStacksEqual(tStack2 = ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack)) || ((tStack != null) && (tStack.stackSize != tStack2.stackSize))) {
-										Utils.LOG_INFO("Returning aPlayer.inventory.getItemStack() for slot: "+aSlotIndex+" on line 111");
-										return aPlayer.inventory.getItemStack();
-									}
-									Utils.LOG_INFO("Doing something ~ 1");
-									aPlayer.inventory.mainInventory[i] = ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.mainInventory[i]);
-								}
-							}
-						}
-						else
-						{
-							if (aMouseclick == 0)
-							{
-								if (((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).canDoCraftingOutput()) {
-									Utils.LOG_INFO("Doing something ~ 2");
-									aPlayer.inventory.setItemStack(((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
-								}
-								Utils.LOG_INFO("Returning aPlayer.inventory.getItemStack() for slot: "+aSlotIndex+" on line 127");
-								return aPlayer.inventory.getItemStack();
-							}
-							for (int i = 0; (i < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize) && (((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).canDoCraftingOutput()); i++)
-							{
-								ItemStack tStack2;
-								if ((!GT_Utility.areStacksEqual(tStack2 = ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack)) || ((tStack != null) && (tStack.stackSize != tStack2.stackSize))) {
-									Utils.LOG_INFO("Returning aPlayer.inventory.getItemStack() for slot: "+aSlotIndex+" on line 134");
-									return aPlayer.inventory.getItemStack();
-								}
-								Utils.LOG_INFO("Doing something ~ 3");
-								aPlayer.inventory.setItemStack(((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
-							}
-							Utils.LOG_INFO("Returning aPlayer.inventory.getItemStack() for slot: "+aSlotIndex+" on line 140");
-							return aPlayer.inventory.getItemStack();
-						}
-					}
-					Utils.LOG_INFO("Returning null on Line 144");
-					return null;
-				}
-				if (aSlotIndex == 34)
-				{
-					((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).mFlushMode = true;
-					Utils.LOG_INFO("Returning null on Line 150");
-					return null;
-				}
-				if (aSlotIndex == 35)
-				{
-					((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).sortIntoTheInputSlots();
-					Utils.LOG_INFO("Returning null on Line 156");
-					return null;
-				}
-			}
-		}
-		catch (Throwable e)
-		{
-			e.printStackTrace(GT_Log.err);
-		}
-		Utils.LOG_INFO("Returning super.slotClick() on Line 162");
-		return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
-	}
-
-	@Override
-	public int getSlotCount()
-	{
-		return 33;
-	}
-
-	@Override
-	public int getShiftClickSlotCount()
-	{
-		return 21;
-	}
-}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_BronzeWorkbench.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_BronzeWorkbench.java
deleted file mode 100644
index 650e80ebd5..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_BronzeWorkbench.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.gui;
-
-import gregtech.api.gui.GT_ContainerMetaTile_Machine;
-import gregtech.api.gui.GT_Slot_Holo;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_BronzeCraftingTable;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class CONTAINER_BronzeWorkbench  extends GT_ContainerMetaTile_Machine {
-
-	public CONTAINER_BronzeWorkbench(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
-		super(aInventoryPlayer, aTileEntity);
-	}
-
-	public CONTAINER_BronzeWorkbench(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, boolean bindInventory) {
-		super(aInventoryPlayer, aTileEntity, bindInventory);
-	}
-
-	@Override
-	public void addSlots(InventoryPlayer aInventoryPlayer)
-	{
-		addSlotToContainer(new Slot(this.mTileEntity, 0, 8, 8));
-		addSlotToContainer(new Slot(this.mTileEntity, 1, 26, 8));
-		addSlotToContainer(new Slot(this.mTileEntity, 2, 44, 8));
-		addSlotToContainer(new Slot(this.mTileEntity, 3, 62, 8));
-		addSlotToContainer(new Slot(this.mTileEntity, 4, 8, 26));
-		addSlotToContainer(new Slot(this.mTileEntity, 5, 26, 26));
-		addSlotToContainer(new Slot(this.mTileEntity, 6, 44, 26));
-		addSlotToContainer(new Slot(this.mTileEntity, 7, 62, 26));
-		addSlotToContainer(new Slot(this.mTileEntity, 8, 8, 44));
-		addSlotToContainer(new Slot(this.mTileEntity, 9, 26, 44));
-		addSlotToContainer(new Slot(this.mTileEntity, 10, 44, 44));
-		addSlotToContainer(new Slot(this.mTileEntity, 11, 62, 44));
-		addSlotToContainer(new Slot(this.mTileEntity, 12, 8, 62));
-		addSlotToContainer(new Slot(this.mTileEntity, 13, 26, 62));
-		addSlotToContainer(new Slot(this.mTileEntity, 14, 44, 62));
-		addSlotToContainer(new Slot(this.mTileEntity, 15, 62, 62));
-
-		addSlotToContainer(new Slot(this.mTileEntity, 16, 82, 8));
-		addSlotToContainer(new Slot(this.mTileEntity, 17, 100, 8));
-		addSlotToContainer(new Slot(this.mTileEntity, 18, 118, 8));
-		addSlotToContainer(new Slot(this.mTileEntity, 19, 136, 8));
-		addSlotToContainer(new Slot(this.mTileEntity, 20, 154, 8));
-
-		addSlotToContainer(new Slot(this.mTileEntity, 21, 82, 28));
-		addSlotToContainer(new Slot(this.mTileEntity, 22, 100, 28));
-		addSlotToContainer(new Slot(this.mTileEntity, 23, 118, 28));
-		addSlotToContainer(new Slot(this.mTileEntity, 24, 82, 46));
-		addSlotToContainer(new Slot(this.mTileEntity, 25, 100, 46));
-		addSlotToContainer(new Slot(this.mTileEntity, 26, 118, 46));
-		addSlotToContainer(new Slot(this.mTileEntity, 27, 82, 64));
-		addSlotToContainer(new Slot(this.mTileEntity, 28, 100, 64));
-		addSlotToContainer(new Slot(this.mTileEntity, 29, 118, 64));
-
-		addSlotToContainer(new Slot(this.mTileEntity, 33, 154, 28));
-		addSlotToContainer(new Slot(this.mTileEntity, 34, 154, 64));
-
-		addSlotToContainer(new Slot(this.mTileEntity, 30, 136, 28));
-		addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 31, 136, 64, false, false, 1));
-		addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 32, 154, 46, false, false, 1));
-		addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 32, 136, 46, false, false, 1));
-	}
-
-	public ItemStack func_75144_a(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer)
-	{
-		if ((aSlotIndex < 21) || (aSlotIndex > 35)) {
-			return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
-		}
-		if ((this.mTileEntity == null) || (this.mTileEntity.getMetaTileEntity() == null)) {
-			return null;
-		}
-		try
-		{
-			ItemStack tStack = ((Slot)this.inventorySlots.get(aSlotIndex)).getStack();
-			if ((tStack != null) && (tStack.stackSize <= 0) && (!GT_Utility.areStacksEqual(tStack, aPlayer.inventory.getItemStack()))) {
-				return null;
-			}
-			if (aSlotIndex == 32)
-			{
-				if ((aMouseclick == 0) && (aShifthold == 1))
-				{
-					((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).setBluePrint(null);
-					return null;
-				}
-			}
-			else
-			{
-				if (aSlotIndex == 33)
-				{
-					ItemStack tCraftedStack = ((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).getCraftingOutput();
-					if (tCraftedStack != null) {
-						if (aShifthold == 1)
-						{
-							for (byte i = 0; i < aPlayer.inventory.mainInventory.length; i = (byte)(i + 1)) {
-								for (byte j = 0; (j < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize) && (((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).canDoCraftingOutput()); j = (byte)(j + 1))
-								{
-									ItemStack tStack2;
-									if ((!GT_Utility.areStacksEqual(tStack2 = ((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack)) || ((tStack != null) && (tStack.stackSize != tStack2.stackSize))) {
-										return aPlayer.inventory.getItemStack();
-									}
-									aPlayer.inventory.mainInventory[i] = ((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.mainInventory[i]);
-								}
-							}
-						}
-						else
-						{
-							if (aMouseclick == 0)
-							{
-								if (((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).canDoCraftingOutput()) {
-									aPlayer.inventory.setItemStack(((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
-								}
-								return aPlayer.inventory.getItemStack();
-							}
-							for (int i = 0; (i < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize) && (((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).canDoCraftingOutput()); i++)
-							{
-								ItemStack tStack2;
-								if ((!GT_Utility.areStacksEqual(tStack2 = ((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack)) || ((tStack != null) && (tStack.stackSize != tStack2.stackSize))) {
-									return aPlayer.inventory.getItemStack();
-								}
-								aPlayer.inventory.setItemStack(((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
-							}
-							return aPlayer.inventory.getItemStack();
-						}
-					}
-					return null;
-				}
-				if (aSlotIndex == 34)
-				{
-					((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).mFlushMode = true;
-					return null;
-				}
-				if (aSlotIndex == 35)
-				{
-					((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).sortIntoTheInputSlots();
-					return null;
-				}
-			}
-		}
-		catch (Throwable e)
-		{
-			e.printStackTrace(GT_Log.err);
-		}
-		return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
-	}
-
-	@Override
-	public int getSlotCount()
-	{
-		return 33;
-	}
-
-	@Override
-	public int getShiftClickSlotCount()
-	{
-		return 21;
-	}
-}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedWorkbench.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedWorkbench.java
deleted file mode 100644
index 7da9238bd5..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedWorkbench.java
+++ /dev/null
@@ -1,30 +0,0 @@
-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_AdvancedWorkbench
-extends GT_GUIContainerMetaTile_Machine
-{
-	public GUI_AdvancedWorkbench(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity)
-	{
-		super(new CONTAINER_AdvancedWorkbench(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + "AdvancedCraftingTable.png");
-	}
-
-	@Override
-	protected void drawGuiContainerForegroundLayer(int par1, int par2)
-	{
-		//this.fontRendererObj.drawString("Condenser", 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);
-	}
-}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_BronzeWorkbench.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_BronzeWorkbench.java
deleted file mode 100644
index 597edba503..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_BronzeWorkbench.java
+++ /dev/null
@@ -1,30 +0,0 @@
-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_BronzeWorkbench
-extends GT_GUIContainerMetaTile_Machine
-{
-	public GUI_BronzeWorkbench(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity)
-	{
-		super(new CONTAINER_BronzeWorkbench(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + "BronzeCraftingTable.png");
-	}
-
-	@Override
-	protected void drawGuiContainerForegroundLayer(int par1, int par2)
-	{
-		//this.fontRendererObj.drawString("Condenser", 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);
-	}
-}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index 98fcc6d6bb..3ef5af0774 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -11,7 +11,7 @@ import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.ToolDictNames;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.metatileentity.BaseMetaTileEntityEx;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.GT_Log;
@@ -914,17 +914,17 @@ public class Meta_GT_Proxy {
 	 /**
      * This gives you a new BaseMetaTileEntity. As some Interfaces are not always loaded (Buildcraft, Univeral Electricity) I have to use Invocation at the Constructor of the BaseMetaTileEntity
      */
-	private static Class<BaseMetaTileEntityEx> sBaseMetaTileEntityClass = null;
+	private static Class<BaseMetaTileEntity> sBaseMetaTileEntityClass = null;
 	
-    public static BaseMetaTileEntityEx constructBaseMetaTileEntity() {
+    public static BaseMetaTileEntity constructBaseMetaTileEntity() {
         if (sBaseMetaTileEntityClass == null) {
             try {
-                return (BaseMetaTileEntityEx) (sBaseMetaTileEntityClass = BaseMetaTileEntityEx.class).newInstance();
+                return (BaseMetaTileEntity) (sBaseMetaTileEntityClass = BaseMetaTileEntity.class).newInstance();
             } catch (Throwable e) {/*Do nothing*/}
         }
 
         try {
-            return (BaseMetaTileEntityEx) (sBaseMetaTileEntityClass.newInstance());
+            return (BaseMetaTileEntity) (sBaseMetaTileEntityClass.newInstance());
         } catch (Throwable e) {
             Utils.LOG_INFO("Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
             e.printStackTrace(GT_Log.err);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechBlockMachines.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechBlockMachines.java
deleted file mode 100644
index 0b47d3c5c1..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechBlockMachines.java
+++ /dev/null
@@ -1,553 +0,0 @@
-package gtPlusPlus.xmod.gregtech.common.blocks;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IDebugableBlock;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_Generic_Block;
-import gregtech.api.metatileentity.BaseMetaPipeEntity;
-import gregtech.api.metatileentity.BaseMetaTileEntityEx;
-import gregtech.api.metatileentity.BaseTileEntity;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Item_Machines;
-import gregtech.common.blocks.GT_Material_Machines;
-import gregtech.common.render.GT_Renderer_Block;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.Explosion;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class GregtechBlockMachines
-        extends GT_Generic_Block
-        implements IDebugableBlock, ITileEntityProvider {
-    public static ThreadLocal<IGregTechTileEntity> mTemporaryTileEntity = new ThreadLocal<IGregTechTileEntity>();
-
-    public GregtechBlockMachines() {
-        super(GT_Item_Machines.class, "gt.plusplus.blockmachines", new GT_Material_Machines());
-        GregTech_API.registerMachineBlock(this, -1);
-        setHardness(1.0F);
-        setResistance(10.0F);
-        setStepSound(soundTypeMetal);
-        setCreativeTab(AddToCreativeTab.tabMachines);
-        this.isBlockContainer = true;
-    }
-
-    @Override
-	public String getHarvestTool(int aMeta) {
-        switch (aMeta / 4) {
-            case 0:
-                return "wrench";
-            case 1:
-                return "wrench";
-            case 2:
-                return "cutter";
-            case 3:
-                return "axe";
-		default:
-			break;
-        }
-        return "wrench";
-    }
-
-    @Override
-	public int getHarvestLevel(int aMeta) {
-        return aMeta % 4;
-    }
-
-    @Override
-	protected boolean canSilkHarvest() {
-        return false;
-    }
-
-    @Override
-	public void onNeighborChange(IBlockAccess aWorld, int aX, int aY, int aZ, int aTileX, int aTileY, int aTileZ) {
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof BaseTileEntity)) {
-            ((BaseTileEntity) tTileEntity).onAdjacentBlockChange(aTileX, aTileY, aTileZ);
-        }
-    }
-
-    @Override
-	public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
-        super.onBlockAdded(aWorld, aX, aY, aZ);
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
-        }
-    }
-
-    @Override
-	public String getUnlocalizedName() {
-        return "gt.plusplus.blockmachines";
-    }
-
-    @Override
-	public String getLocalizedName() {
-        return StatCollector.translateToLocal(getUnlocalizedName() + ".name");
-    }
-
-    @Override
-	public int getFlammability(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection face) {
-        return 0;
-    }
-
-    @Override
-	public int getFireSpreadSpeed(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection face) {
-        return (GregTech_API.sMachineFlammable) && (aWorld.getBlockMetadata(aX, aY, aZ) == 0) ? 100 : 0;
-    }
-
-    @Override
-	public int getRenderType() {
-        if (GT_Renderer_Block.INSTANCE == null) {
-            return super.getRenderType();
-        }
-        return GT_Renderer_Block.INSTANCE.mRenderID;
-    }
-
-    @Override
-	public boolean isFireSource(World aWorld, int aX, int aY, int aZ, ForgeDirection side) {
-        return (GregTech_API.sMachineFlammable) && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
-    }
-
-    @Override
-	public boolean isFlammable(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection face) {
-        return (GregTech_API.sMachineFlammable) && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
-    }
-
-    @Override
-	public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess aWorld, int aX, int aY, int aZ) {
-        return false;
-    }
-
-    @Override
-	public boolean canConnectRedstone(IBlockAccess var1, int var2, int var3, int var4, int var5) {
-        return true;
-    }
-
-    @Override
-	public boolean canBeReplacedByLeaves(IBlockAccess aWorld, int aX, int aY, int aZ) {
-        return false;
-    }
-
-    @Override
-	public boolean isNormalCube(IBlockAccess aWorld, int aX, int aY, int aZ) {
-        return false;
-    }
-
-    @Override
-	public boolean hasTileEntity(int aMeta) {
-        return true;
-    }
-
-    @Override
-	public boolean hasComparatorInputOverride() {
-        return true;
-    }
-
-    @Override
-	public boolean renderAsNormalBlock() {
-        return false;
-    }
-
-    @Override
-	public boolean canProvidePower() {
-        return true;
-    }
-
-    @Override
-	public boolean isOpaqueCube() {
-        return false;
-    }
-
-    @Override
-	public TileEntity createNewTileEntity(World aWorld, int aMeta) {
-        return createTileEntity(aWorld, aMeta);
-    }
-
-    @Override
-	public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) {
-        return Textures.BlockIcons.MACHINE_LV_SIDE.getIcon();
-    }
-
-    @Override
-	public IIcon getIcon(int aSide, int aMeta) {
-        return Textures.BlockIcons.MACHINE_LV_SIDE.getIcon();
-    }
-
-    @Override
-	public boolean onBlockEventReceived(World aWorld, int aX, int aY, int aZ, int aData1, int aData2) {
-        super.onBlockEventReceived(aWorld, aX, aY, aZ, aData1, aData2);
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        return tTileEntity != null ? tTileEntity.receiveClientEvent(aData1, aData2) : false;
-    }
-
-    @Override
-	public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List outputAABB, Entity collider) {
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null)) {
-            ((IGregTechTileEntity) tTileEntity).addCollisionBoxesToList(aWorld, aX, aY, aZ, inputAABB, outputAABB, collider);
-            return;
-        }
-        super.addCollisionBoxesToList(aWorld, aX, aY, aZ, inputAABB, outputAABB, collider);
-    }
-
-    @Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null)) {
-            return ((IGregTechTileEntity) tTileEntity).getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
-        }
-        return super.getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
-    }
-
-    @Override
-	public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider) {
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null)) {
-            ((IGregTechTileEntity) tTileEntity).onEntityCollidedWithBlock(aWorld, aX, aY, aZ, collider);
-            return;
-        }
-        super.onEntityCollidedWithBlock(aWorld, aX, aY, aZ, collider);
-    }
-
-    @Override //TODO
-	@SideOnly(Side.CLIENT) //TODO
-    public void registerBlockIcons(IIconRegister aIconRegister) {
-        if (GregTech_API.sPostloadFinished) {
-            Utils.LOG_INFO("Setting up Icon Register for Blocks");
-            Meta_GT_Proxy.sBlockIcons = aIconRegister;
-
-            Utils.LOG_INFO("Registering MetaTileEntity specific Textures");
-            for (IMetaTileEntity tMetaTileEnti