Merge branch 'GTNewHorizons:master' into master

2 files changed, 53 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java b/src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java
new file mode 100644
index 0000000000..664ffe7b2d
--- /dev/null
+++ b/src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java
@@ -0,0 +1,28 @@
+package gtPlusPlus.preloader.asm.helpers;
+
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.guihook.IContainerInputHandler;
+import net.minecraft.client.gui.inventory.GuiContainer;
+
+public class MethodHelper_CC {
+
+
+    public void mouseUp2(int mousex, int mousey, int button) {
+    	MethodHelper_CC.mouseUp(mousex, mousey, button);
+    }
+	
+    public static void mouseUp(int mousex, int mousey, int button) {
+    	GuiContainerManager aManager = codechicken.nei.guihook.GuiContainerManager.getManager();
+    	if (aManager != null) {
+    		GuiContainer aWindow = aManager.window;    	
+    		for (IContainerInputHandler inputhander : GuiContainerManager.inputHandlers) {
+            	//Preloader_Logger.INFO("Found Handler: "+aWindow.getClass().getName() + " | "+inputhander.getClass().getName());
+            }
+            for (IContainerInputHandler inputhander : GuiContainerManager.inputHandlers) {
+            	//Preloader_Logger.INFO("Trying to handle events for "+aWindow.getClass().getName() + " | "+inputhander.getClass().getName());
+                inputhander.onMouseUp(aWindow, mousex, mousey, button);        	
+            }
+    	}
+    }
+	
+}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_GT.java b/src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_GT.java
new file mode 100644
index 0000000000..8120df81fa
--- /dev/null
+++ b/src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_GT.java
@@ -0,0 +1,25 @@
+package gtPlusPlus.preloader.asm.helpers;
+
+import java.util.List;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class MethodHelper_GT {
+
+	public static final void getSubItems(GT_MetaGenerated_Tool aTool, Item var1, CreativeTabs aCreativeTab, List aList) {
+		for (int i = 0; i < 32766; i += 2) {
+			if (aTool.getToolStats(new ItemStack(aTool, 1, i)) != null) {
+				ItemStack tStack = new ItemStack(aTool, 1, i);
+				aTool.isItemStackUsable(tStack);
+				aList.add(tStack);
+				aList.add(aTool.getToolWithStats(i,1,Materials.TungstenSteel,Materials.TungstenSteel,null));
+				aList.add(aTool.getToolWithStats(i,1,Materials.Neutronium,Materials.Neutronium,null));
+			}
+		}
+	}
+	
+}