diff options
author | Alkalus <draknyte1@hotmail.com> | 2016-10-03 23:33:28 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 23:33:28 +1000 |
commit | e3f4a410ef0867359cab3ade72a20c3679aaad06 (patch) | |
tree | 2f008c251c080a216b0fcf3d03667f7233edceca /src/Java/gtPlusPlus/core/handler | |
parent | 10aee9adf7a1ab793a05fd9327cec6fcc1b267d2 (diff) | |
parent | bdb6fc4a5410d68cf517dbe90fa49cec45bbda5a (diff) | |
download | GT5-Unofficial-e3f4a410ef0867359cab3ade72a20c3679aaad06.tar.gz GT5-Unofficial-e3f4a410ef0867359cab3ade72a20c3679aaad06.tar.bz2 GT5-Unofficial-e3f4a410ef0867359cab3ade72a20c3679aaad06.zip |
Merge pull request #19 from draknyte1/DesktopPC
+ Added some Buttons to the workbench (WIP)
$ Workbench now uses the vanilla recipe handler.
$ Fixed the tool slots on the Workbench accepting the wrong items in certain cases.
+ Added hundreds of new machine recipes for all of the materials, due to below.
$ Rewrote recipe generation classes, things like plate bending and extrusion recipes now fall in line with GT tiering.
+ Added more functions to Materials.java, now you can get any item from them. (getDustSmall(5))
% Changed tool handling to better support older versions of Gregtech that don't allow Wrenchs to work as a BC/EIO wrench.
% Moved more GT related content to HANDLER_GT.
+ Added a basic re-implementation of the Meta Tile Entity system for GT Machines, using my own blocks as a base. In a feeble attempt to store NBT data to Itemblocks on drop/break.
% Changed lots of debug logging to only show in debug mode, if I missed anything, let me know.
Diffstat (limited to 'src/Java/gtPlusPlus/core/handler')
-rw-r--r-- | src/Java/gtPlusPlus/core/handler/GuiHandler.java | 28 |
1 files changed, 15 insertions, 13 deletions
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; } |