Merge branch 'master' of https://github.com/draknyte1/GTplusplus

2 files changed, 46 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java
index 2da4c7bc7c..86388a2632 100644
--- a/src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java
@@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class GUI_Workbench extends GuiContainer {
 
-	private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(CORE.MODID, "textures/gui/Workbench.png");
+	private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(CORE.MODID, "textures/gui/BronzeCraftingTable.png");
 	
 	public boolean moveItemsToChest = false;
 	public boolean moveItemsToCrafting = false;
@@ -52,8 +52,8 @@ public class GUI_Workbench extends GuiContainer {
 		super.initGui();
 
 		//The parameters of GuiButton are(id, x, y, width, height, text);
-		this.buttonList.add(new GuiButton( 1, 367, 132, 18, 18, "X"));
-		this.buttonList.add(new GuiButton( 2, 385, 132, 18, 18, "Y"));
+		//this.buttonList.add(new GuiButton( 1, 367, 132, 18, 18, "X"));
+		//this.buttonList.add(new GuiButton( 2, 385, 132, 18, 18, "Y"));
 		//NOTE: the id always has to be different or else it might get called twice or never!
 
 		//Add any other buttons here too!
@@ -65,12 +65,12 @@ public class GUI_Workbench extends GuiContainer {
 		//If the button id is different, or you have mrs buttons, create another if block for that too!
 		if(B.id == 1){
 			System.out.println("Trying to empty crafting grid to the storage compartment.");
-			moveItemsToChest = true;
+			//moveItemsToChest = true;
 			((Container_Workbench) this.inventorySlots).moveCraftingToChest();
 		}
 		else if(B.id == 2){
 			System.out.println("Trying to move items into the crafting grid.");
-			moveItemsToCrafting = true;
+			//moveItemsToCrafting = true;
 			((Container_Workbench) this.inventorySlots).moveChestToCrafting();
 		}
 
diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java
new file mode 100644
index 0000000000..5c04acf13b
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java
@@ -0,0 +1,41 @@
+package gtPlusPlus.core.gui.machine;
+
+import gtPlusPlus.core.container.Container_WorkbenchAdvanced;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class GUI_WorkbenchAdvanced extends GuiContainer {
+
+	private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(CORE.MODID, "textures/gui/AdvancedCraftingTable.png");
+
+	public GUI_WorkbenchAdvanced(InventoryPlayer player_inventory, TileEntityWorkbenchAdvanced tile){
+		super(new Container_WorkbenchAdvanced(player_inventory, tile));
+	}
+
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(int i, int j){
+		//this.fontRendererObj.drawString(I18n.format("Workbench", new Object[0]), 28, 6, 4210752);
+		//this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
+	}
+
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(float f, int i, int j){       
+		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);       
+		this.mc.renderEngine.bindTexture(craftingTableGuiTextures);       
+		int x = (width - xSize) / 2;       
+		int y = (height - ySize) / 2;       
+		this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+	}
+
+}
\ No newline at end of file