From 12dab5d109ac81034fd0a8fe18317024a996af61 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 24 Dec 2018 03:59:59 +0000
Subject: + Added a config option to adjust the Turbine Rotor removal cut-off
 point. + Added some new Bags/Packs for various things. An Automatic Lunchbox,
 a Tool Box and a Magicians Satchel. + Added full compound of Eglin Steel to
 ABS. Closes #392. - Removed all Multi-Tools. $ Rewrote and Fixed the recipe
 system. All recipes are queued regardless of when called, then created during
 the end of the POST_INIT load phase. Fixes too many bugs to list. (Few more
 to do before tomorrow) $ Fixed COFH Hard requirement. Closes #398. % Adjusted
 the internal map type of the AutoMap. Should improve performance, if only in
 single digit cpu cycles.

> To-Do) Fix Recipes pertaining to compound materials made from using fluids. State may be detected wrong after recipe system changes.
---
 src/Java/gtPlusPlus/core/handler/GuiHandler.java | 40 ++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 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 816b35ea4b..c02425afbf 100644
--- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
@@ -11,14 +11,25 @@ import net.minecraft.world.World;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.container.*;
+import gtPlusPlus.core.container.box.LunchBoxContainer;
+import gtPlusPlus.core.container.box.MagicBagContainer;
+import gtPlusPlus.core.container.box.ToolBoxContainer;
 import gtPlusPlus.core.gui.beta.Gui_ID_Registry;
 import gtPlusPlus.core.gui.beta.MU_GuiId;
 import gtPlusPlus.core.gui.item.GuiBaseBackpack;
 import gtPlusPlus.core.gui.item.GuiBaseGrindle;
+import gtPlusPlus.core.gui.item.box.LunchBoxGui;
+import gtPlusPlus.core.gui.item.box.MagicBagGui;
+import gtPlusPlus.core.gui.item.box.ToolBoxGui;
 import gtPlusPlus.core.gui.machine.*;
 import gtPlusPlus.core.interfaces.IGuiManager;
 import gtPlusPlus.core.inventories.BaseInventoryBackpack;
 import gtPlusPlus.core.inventories.BaseInventoryGrindle;
+import gtPlusPlus.core.inventories.box.LunchBoxInventory;
+import gtPlusPlus.core.inventories.box.MagicBagInventory;
+import gtPlusPlus.core.inventories.box.ToolBoxInventory;
+import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
+import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
 import gtPlusPlus.core.tileentities.base.TileEntityBase;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
@@ -35,6 +46,9 @@ public class GuiHandler implements IGuiHandler {
 	public static final int GUI7 = 6; // Trade table
 	public static final int GUI8 = 7; // Circuit Programmer
 	public static final int GUI9 = 8; // Grindle
+	public static final int GUI10 = 9; // Universal Toolbox
+	public static final int GUI11 = 10; // Auto Lunchbox
+	public static final int GUI12 = 11; // Bag for Magic Tools
 
 	public static void init() {
 
@@ -83,6 +97,16 @@ public class GuiHandler implements IGuiHandler {
 		if (ID == GUI9) {
 			return new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem()));
 		}
+		//Tool, lunch, magic
+		if (ID == GUI10) {
+			return new ToolBoxContainer(player, player.inventory, new ToolBoxInventory(player.getHeldItem()));
+		}
+		if (ID == GUI11) {
+			return new LunchBoxContainer(player, player.inventory, new LunchBoxInventory(player.getHeldItem()));
+		}
+		if (ID == GUI12) {
+			return new MagicBagContainer(player, player.inventory, new MagicBagInventory(player.getHeldItem()));
+		}
 
 		return null;
 	}
@@ -125,9 +149,21 @@ public class GuiHandler implements IGuiHandler {
 		}
 
 		if (ID == GUI9) {
-			return new GuiBaseGrindle(
-					new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem())));
+			return new GuiBaseGrindle(new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem())));
+		}
+		
+
+		//Tool, lunch, magic
+		if (ID == GUI10) {
+			return new ToolBoxGui(new ToolBoxContainer(player, player.inventory, new ToolBoxInventory(player.getHeldItem())));
+		}
+		if (ID == GUI11) {
+			return new LunchBoxGui(new LunchBoxContainer(player, player.inventory, new LunchBoxInventory(player.getHeldItem())));
+		}
+		if (ID == GUI12) {
+			return new MagicBagGui(new MagicBagContainer(player, player.inventory, new MagicBagInventory(player.getHeldItem())));
 		}
+		
 
 		return null;
 	}
-- 
cgit