From bdb6fc4a5410d68cf517dbe90fa49cec45bbda5a Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Mon, 3 Oct 2016 18:08:43 +1000 Subject: % Gotta Re-merge these Changes with those made on my laptop. --- src/Java/gtPlusPlus/core/handler/GuiHandler.java | 28 +++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'src/Java/gtPlusPlus/core/handler') diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java index b9b3229f13..dc1903e83d 100644 --- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java +++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java @@ -32,7 +32,7 @@ public class GuiHandler implements IGuiHandler { public static final int GUI6 = 5; // public static final int GUI7 = 6; // public static final int GUI8 = 7; // - + public static void init(){ @@ -60,25 +60,27 @@ public class GuiHandler implements IGuiHandler { } - + if (ID == GUI3) { // Use the player's held item to create the inventory return new Container_BackpackBase(player, player.inventory, new BaseInventoryBackpack(player.getHeldItem())); } - + if (te != null){ if (ID == GUI4){ + return new Container_Workbench(player.inventory, (TileEntityWorkbench)te); + } } - - - - - - - + + + + + + + return null; } @@ -98,20 +100,20 @@ public class GuiHandler implements IGuiHandler { //return new GUI_RTG((TileEntityRTG) te.); } } - + if (ID == GUI3) { // We have to cast the new container as our custom class // and pass in currently held item for the inventory return new GuiBaseBackpack((Container_BackpackBase) new Container_BackpackBase(player, player.inventory, new BaseInventoryBackpack(player.getHeldItem()))); } - + if (te != null){ if (ID == GUI4){ return new GUI_Workbench(player.inventory, (TileEntityWorkbench)te); } } - + return null; } -- cgit