Bring in experimental branch

1 files changed, 23 insertions, 6 deletions

diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
index e9676de41f..92bfdf4063 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
@@ -11,11 +11,14 @@ import codechicken.nei.recipe.GuiUsageRecipe;
 import codechicken.nei.recipe.TemplateRecipeHandler;

 import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe;

 import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect;

+

 import com.google.common.collect.ListMultimap;

+

 import cpw.mods.fml.common.event.FMLInterModComms;

 import gregtech.api.enums.GT_Values;

 import gregtech.api.enums.OrePrefixes;

 import gregtech.api.gui.GT_GUIContainer_BasicMachine;

+import gregtech.api.gui.GT_GUIContainer_MultiMachine;

 import gregtech.api.objects.ItemData;

 import gregtech.api.objects.MaterialStack;

 import gregtech.api.util.GT_LanguageManager;

@@ -23,6 +26,8 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;

 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

 import gregtech.api.util.GT_Utility;

+import gregtech.common.gui.GT_GUIContainer_FusionReactor;

+

 import java.awt.Point;

 import java.awt.Rectangle;

 import java.util.ArrayList;

@@ -30,6 +35,7 @@ import java.util.Collection;
 import java.util.Iterator;

 import java.util.LinkedList;

 import java.util.List;

+

 import net.minecraft.client.Minecraft;

 import net.minecraft.client.gui.FontRenderer;

 import net.minecraft.client.gui.inventory.GuiContainer;

@@ -38,6 +44,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;

 import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;

 import net.minecraftforge.fluids.FluidStack;

+

 import org.lwjgl.opengl.GL11;

 

 public class GT_NEI_DefaultHandler

@@ -615,21 +622,31 @@ public class GT_NEI_DefaultHandler
     

     public boolean canHandle(GuiContainer gui)

     {

-      return ((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine)gui).mNEI));

+      return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine)gui).mNEI))||((gui instanceof GT_GUIContainer_FusionReactor)) && (GT_Utility.isStringValid(((GT_GUIContainer_FusionReactor)gui).mNEI)));

     }

     

     public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip)

     {

-      if ((canHandle(gui)) && (currenttip.isEmpty()) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine)gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine)gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1])))) {

-        currenttip.add("Recipes");

-      }

+      if ((canHandle(gui)) && (currenttip.isEmpty())){

+    	 if(gui instanceof GT_GUIContainer_BasicMachine && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine)gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine)gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1])))

+    	 {currenttip.add("Recipes");

+    	 }else if(gui instanceof GT_GUIContainer_FusionReactor && new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor)gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor)gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1])))

+    	 {currenttip.add("Recipes");

+    	 }

+      

+    	 }

       return currenttip;

     }

     

     private boolean transferRect(GuiContainer gui, boolean usage)

     {

-      return (canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine)gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine)gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine)gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine)gui).mNEI, new Object[0]));

-    }

+    	if(gui instanceof GT_GUIContainer_BasicMachine){

+    	return (canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine)gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine)gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine)gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine)gui).mNEI, new Object[0]));

+    	}else if(gui instanceof GT_GUIContainer_FusionReactor){

+    	return (canHandle(gui)) && (new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor)gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor)gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor)gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor)gui).mNEI, new Object[0]));	

+    	}

+    	return false;

+      }

     

     public List<String> handleItemDisplayName(GuiContainer gui, ItemStack itemstack, List<String> currenttip)

     {