Rewrote and readded Bronze/Advanced Workbenches using GT Meta Tile system.

4 files changed, 341 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_Container_AdvancedWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_Container_AdvancedWorkbench.java
new file mode 100644
index 0000000000..d7ec19a9ac
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_Container_AdvancedWorkbench.java
@@ -0,0 +1,124 @@
+package gtPlusPlus.xmod.gregtech.api.gui.workbench;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.gui.GT_Slot_Holo;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.slots.SlotBlueprint;
+import gtPlusPlus.core.slots.SlotElectric;
+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 GT_Container_AdvancedWorkbench extends GT_ContainerMetaTile_Machine {
+
+	public GT_Container_AdvancedWorkbench(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+	
+    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 SlotElectric(mTileEntity, 16,  82,  8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 17, 100,  8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 18, 118,  8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 19, 136,  8));
+        addSlotToContainer(new SlotElectric(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 SlotBlueprint(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));
+        
+    }
+    
+    public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
+    	Logger.INFO("Clicked on slot "+aSlotIndex);
+    	if (aSlotIndex < 21 || aSlotIndex > 35) return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+    	if (mTileEntity == null || mTileEntity.getMetaTileEntity() == null) return null;
+    	try {
+		    ItemStack tStack = ((Slot)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_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).setBluePrint(null);
+		    		return null;
+		    	}
+		    } else if (aSlotIndex == 33) {
+		    	ItemStack tStack2, tCraftedStack = ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).getCraftingOutput();
+		    	if (tCraftedStack != null) {
+			    	if (aShifthold == 1) {
+				    	for (byte i = 0; i < aPlayer.inventory.mainInventory.length; i++) {
+					    	for (byte j = 0; j < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize && ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).canDoCraftingOutput(); j++) {
+					    		if (!GT_Utility.areStacksEqual(tStack2 = ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack) || tStack.stackSize != tStack2.stackSize) return aPlayer.inventory.getItemStack();
+					    		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()) aPlayer.inventory.setItemStack(((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
+					    	return aPlayer.inventory.getItemStack();
+				    	} else {
+					    	for (int i = 0; i < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize && ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).canDoCraftingOutput(); i++) {
+					    		if (!GT_Utility.areStacksEqual(tStack2 = ((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack) || tStack.stackSize != tStack2.stackSize) return aPlayer.inventory.getItemStack();
+					    		aPlayer.inventory.setItemStack(((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
+					    	}
+					    	return aPlayer.inventory.getItemStack();
+					    }
+				    }
+		    	}
+		    	return null;
+	    	} else if (aSlotIndex == 34) {
+	    		((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).mFlushMode = true;
+	    		return null;
+	    	} else if (aSlotIndex == 35) {
+	    		((GT_MetaTileEntity_AdvancedCraftingTable)mTileEntity.getMetaTileEntity()).sortIntoTheInputSlots();
+	    		return null;
+	    	}
+    	} catch(Throwable e) {
+    		//GT_Log.log.catching(e);
+    	}
+	    return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+    }
+    
+    public int getSlotCount() {
+    	return 33;
+    }
+    
+    public int getShiftClickSlotCount() {
+    	return 21;
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_Container_BronzeWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_Container_BronzeWorkbench.java
new file mode 100644
index 0000000000..f7cfd31e5d
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_Container_BronzeWorkbench.java
@@ -0,0 +1,120 @@
+package gtPlusPlus.xmod.gregtech.api.gui.workbench;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.gui.GT_Slot_Holo;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Utility;
+import 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 GT_Container_BronzeWorkbench extends GT_ContainerMetaTile_Machine {
+
+	public GT_Container_BronzeWorkbench(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+	
+    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 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(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));
+        
+    }
+    
+    public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
+    	if (aSlotIndex < 21 || aSlotIndex > 35) return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+    	if (mTileEntity == null || mTileEntity.getMetaTileEntity() == null) return null;
+    	try {
+		    ItemStack tStack = ((Slot)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)mTileEntity.getMetaTileEntity()).setBluePrint(null);
+		    		return null;
+		    	}
+		    } else if (aSlotIndex == 33) {
+		    	ItemStack tStack2, tCraftedStack = ((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).getCraftingOutput();
+		    	if (tCraftedStack != null) {
+			    	if (aShifthold == 1) {
+				    	for (byte i = 0; i < aPlayer.inventory.mainInventory.length; i++) {
+					    	for (byte j = 0; j < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize && ((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).canDoCraftingOutput(); j++) {
+					    		if (!GT_Utility.areStacksEqual(tStack2 = ((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack) || tStack.stackSize != tStack2.stackSize) return aPlayer.inventory.getItemStack();
+					    		aPlayer.inventory.mainInventory[i] = (((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.mainInventory[i]));
+					    	}
+				    	}
+				    } else {
+				    	if (aMouseclick == 0) {
+					    	if (((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).canDoCraftingOutput()) aPlayer.inventory.setItemStack(((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
+					    	return aPlayer.inventory.getItemStack();
+				    	} else {
+					    	for (int i = 0; i < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize && ((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).canDoCraftingOutput(); i++) {
+					    		if (!GT_Utility.areStacksEqual(tStack2 = ((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).getCraftingOutput(), tCraftedStack) || tStack.stackSize != tStack2.stackSize) return aPlayer.inventory.getItemStack();
+					    		aPlayer.inventory.setItemStack(((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
+					    	}
+					    	return aPlayer.inventory.getItemStack();
+					    }
+				    }
+		    	}
+		    	return null;
+	    	} else if (aSlotIndex == 34) {
+	    		((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).mFlushMode = true;
+	    		return null;
+	    	} else if (aSlotIndex == 35) {
+	    		((GT_MetaTileEntity_BronzeCraftingTable)mTileEntity.getMetaTileEntity()).sortIntoTheInputSlots();
+	    		return null;
+	    	}
+    	} catch(Throwable e) {
+    		//GT_Log.log.catching(e);
+    	}
+	    return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+    }
+    
+    public int getSlotCount() {
+    	return 33;
+    }
+    
+    public int getShiftClickSlotCount() {
+    	return 21;
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_GUIContainer_AdvancedWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_GUIContainer_AdvancedWorkbench.java
new file mode 100644
index 0000000000..fc3041f553
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_GUIContainer_AdvancedWorkbench.java
@@ -0,0 +1,84 @@
+package gtPlusPlus.xmod.gregtech.api.gui.workbench;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GT_GUIContainer_AdvancedWorkbench extends GT_GUIContainerMetaTile_Machine {
+	
+	private final String mLocalName;
+	
+    public GT_GUIContainer_AdvancedWorkbench(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aLocalName) {
+        super(new GT_Container_AdvancedWorkbench(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + "AdvancedCraftingTable.png");
+        mLocalName = aLocalName;
+    }
+    
+    public GT_GUIContainer_AdvancedWorkbench(GT_ContainerMetaTile_Machine aContainer, String aLocalName, String aResource) {
+        super(aContainer, aResource);
+        mLocalName = aLocalName;
+    }
+    
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        //fontRendererObj.drawString(mLocalName, 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>();
+		//154 - 172
+		
+		if (KeyboardUtils.isShiftKeyDown()) {
+			if (y3 >= 30 && y3 <= 49) {			
+				if (x3 >= 135 && x3 <= 154) {
+					list.add("Blueprint Slot");
+					list.add("Shift+Lmb Sets to crafting output");	
+				}
+				if (x3 >= 153 && x3 <= 170) {
+					list.add("Extraction Slot");
+					list.add("Things can always be pulled from here");	
+				}
+			}
+			if (y3 >= 50 && y3 <= 67) {			
+				if (x3 >= 135 && x3 <= 152) {
+					list.add("Flush");	
+					list.add("Empty crafting grid back to storage");	
+				}
+				if (x3 >= 153 && x3 <= 170) {
+					list.add("Automation");	
+					list.add("Allows output while");
+					list.add("crafting grid is full");
+				}
+			}
+			if (y3 >= 68 && y3 <= 85){			
+				if (x3 >= 135 && x3 <= 152) {
+					list.add("Output Slot");	
+				}
+				if (x3 >= 153 && x3 <= 170) {
+					list.add("Free Parking");	
+				}
+			}
+		}
+		if (!list.isEmpty()) {
+			this.drawHoveringText(list, x3, y3, this.fontRendererObj);
+		}
+	}
+	
+    @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/workbench/GT_GUIContainer_BronzeWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_GUIContainer_BronzeWorkbench.java
new file mode 100644
index 0000000000..178c9241f1
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_GUIContainer_BronzeWorkbench.java
@@ -0,0 +1,13 @@
+package gtPlusPlus.xmod.gregtech.api.gui.workbench;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GT_GUIContainer_BronzeWorkbench extends GT_GUIContainer_AdvancedWorkbench {
+
+    public GT_GUIContainer_BronzeWorkbench(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aLocalName) {
+        super(new GT_Container_BronzeWorkbench(aInventoryPlayer, aTileEntity), aLocalName, CORE.RES_PATH_GUI + "BronzeCraftingTable.png");
+    }
+    
+}