% Rewrote a lot of the Container code for the workbenches to better reflect 1.7.10 and Gt5.

% Changed the IDs of workbenches.

3 files changed, 94 insertions, 81 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedWorkbench.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedWorkbench.java
index bb7982afe3..4a1eac7ac1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedWorkbench.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedWorkbench.java
@@ -5,85 +5,92 @@ 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.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 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(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(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 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(mTileEntity, 16, 82, 8));
+		addSlotToContainer(new Slot(mTileEntity, 17, 100, 8));
+		addSlotToContainer(new Slot(mTileEntity, 18, 118, 8));
+		addSlotToContainer(new Slot(mTileEntity, 19, 136, 8));
+		addSlotToContainer(new Slot(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(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(this.mTileEntity, 33, 154, 28));
-		addSlotToContainer(new Slot(this.mTileEntity, 34, 154, 64));
+		addSlotToContainer(new Slot(mTileEntity, 33, 154, 28));
+		addSlotToContainer(new Slot(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));
+		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)
-	{
+	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 ((this.mTileEntity == null) || (this.mTileEntity.getMetaTileEntity() == null)) {
+		if ((mTileEntity == null) || (mTileEntity.getMetaTileEntity() == null)) {
+			Utils.LOG_INFO("Returning null on Line 78");
 			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 85");
 				return null;
 			}
 			if (aSlotIndex == 32)
 			{
 				if ((aMouseclick == 0) && (aShifthold == 1))
 				{
-					((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).setBluePrint(null);
+					((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).setBluePrint(null);
+					Utils.LOG_INFO("Returning null on Line 93");
 					return null;
 				}
 			}
@@ -91,18 +98,19 @@ extends GT_ContainerMetaTile_Machine
 			{
 				if (aSlotIndex == 33)
 				{
-					ItemStack tCraftedStack = ((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).getCraftingOutput();
+					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)this.mTileEntity.getMetaTileEntity()).canDoCraftingOutput()); j = (byte)(j + 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)this.mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack)) || ((tStack != null) && (tStack.stackSize != tStack2.stackSize))) {
+									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();
 									}
-									aPlayer.inventory.mainInventory[i] = ((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.mainInventory[i]);
+									aPlayer.inventory.mainInventory[i] = ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.mainInventory[i]);
 								}
 							}
 						}
@@ -110,32 +118,35 @@ extends GT_ContainerMetaTile_Machine
 						{
 							if (aMouseclick == 0)
 							{
-								if (((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).canDoCraftingOutput()) {
-									aPlayer.inventory.setItemStack(((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
+								if (((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).canDoCraftingOutput()) {
+									aPlayer.inventory.setItemStack(((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
 								}
 								return aPlayer.inventory.getItemStack();
 							}
-							for (int i = 0; (i < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize) && (((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).canDoCraftingOutput()); i++)
+							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)this.mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack)) || ((tStack != null) && (tStack.stackSize != tStack2.stackSize))) {
+								if ((!GT_Utility.areStacksEqual(tStack2 = ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack)) || ((tStack != null) && (tStack.stackSize != tStack2.stackSize))) {
 									return aPlayer.inventory.getItemStack();
 								}
-								aPlayer.inventory.setItemStack(((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
+								aPlayer.inventory.setItemStack(((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
 							}
 							return aPlayer.inventory.getItemStack();
 						}
 					}
+					Utils.LOG_INFO("Returning null on Line 136");
 					return null;
 				}
 				if (aSlotIndex == 34)
 				{
-					((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).mFlushMode = true;
+					((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).mFlushMode = true;
+					Utils.LOG_INFO("Returning null on Line 142");
 					return null;
 				}
 				if (aSlotIndex == 35)
 				{
-					((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).sortIntoTheInputSlots();
+					((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).sortIntoTheInputSlots();
+					Utils.LOG_INFO("Returning null on Line 148");
 					return null;
 				}
 			}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_BronzeWorkbench.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_BronzeWorkbench.java
index d093101044..650e80ebd5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_BronzeWorkbench.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_BronzeWorkbench.java
@@ -5,20 +5,22 @@ 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_AdvancedCraftingTable;
+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)
-	{
+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)
 	{
@@ -64,8 +66,7 @@ extends GT_ContainerMetaTile_Machine
 		addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 32, 136, 46, false, false, 1));
 	}
 
-	@Override
-	public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer)
+	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);
@@ -83,7 +84,7 @@ extends GT_ContainerMetaTile_Machine
 			{
 				if ((aMouseclick == 0) && (aShifthold == 1))
 				{
-					((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).setBluePrint(null);
+					((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).setBluePrint(null);
 					return null;
 				}
 			}
@@ -91,18 +92,18 @@ extends GT_ContainerMetaTile_Machine
 			{
 				if (aSlotIndex == 33)
 				{
-					ItemStack tCraftedStack = ((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).getCraftingOutput();
+					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_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).canDoCraftingOutput()); j = (byte)(j + 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_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack)) || ((tStack != null) && (tStack.stackSize != tStack2.stackSize))) {
+									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_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.mainInventory[i]);
+									aPlayer.inventory.mainInventory[i] = ((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.mainInventory[i]);
 								}
 							}
 						}
@@ -110,18 +111,18 @@ extends GT_ContainerMetaTile_Machine
 						{
 							if (aMouseclick == 0)
 							{
-								if (((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).canDoCraftingOutput()) {
-									aPlayer.inventory.setItemStack(((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
+								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_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).canDoCraftingOutput()); i++)
+							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_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack)) || ((tStack != null) && (tStack.stackSize != tStack2.stackSize))) {
+								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_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
+								aPlayer.inventory.setItemStack(((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
 							}
 							return aPlayer.inventory.getItemStack();
 						}
@@ -130,12 +131,12 @@ extends GT_ContainerMetaTile_Machine
 				}
 				if (aSlotIndex == 34)
 				{
-					((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).mFlushMode = true;
+					((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).mFlushMode = true;
 					return null;
 				}
 				if (aSlotIndex == 35)
 				{
-					((GT_MetaTileEntity_AdvancedCraftingTable)this.mTileEntity.getMetaTileEntity()).sortIntoTheInputSlots();
+					((GT_MetaTileEntity_BronzeCraftingTable)this.mTileEntity.getMetaTileEntity()).sortIntoTheInputSlots();
 					return null;
 				}
 			}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
index 1475a8140a..4632b306ed 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
@@ -33,9 +33,10 @@ public class GregtechTieredFluidTanks
         GregtechItemList.GT_FluidTank_ZPM.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.07", "ZPM Voltage Fluid Tank", 7).getStackForm(1L));
         GregtechItemList.GT_FluidTank_UV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.08", "Ultimate Voltage Fluid Tank", 8).getStackForm(1L));
         GregtechItemList.GT_FluidTank_MAX.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.09", "MAX Voltage Fluid Tank", 9).getStackForm(1L));
-        ID = 900;
-		GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable(ID++, "workbench.bronze", "Bronze Workbench", 0).getStackForm(1L));
-		GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(ID++, "workbench.advanced", "Advanced Workbench", 1).getStackForm(1L));
+        
+        //Gregtech 4 Workbenches
+		GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze", "Bronze Workbench", 0).getStackForm(1L));
+		GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced", "Advanced Workbench", 1).getStackForm(1L));
         
         
 	}