Merge pull request #48 from GTNewHorizons/feature/nei-handler-move-to-recipemap

Remove individual NEI handlers

4 files changed, 2 insertions, 65 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java
deleted file mode 100644
index 0f916ff948..0000000000
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.elisis.gtnhlanth.xmod.nei;
-
-import codechicken.nei.recipe.GuiCraftingRecipe;
-import codechicken.nei.recipe.GuiUsageRecipe;
-import codechicken.nei.recipe.TemplateRecipeHandler;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.nei.GT_NEI_DefaultHandler;
-
-public class DigesterHandler extends GT_NEI_DefaultHandler {
-
-    public DigesterHandler(GT_Recipe_Map recipeMap) {
-        super(recipeMap);
-        if (!NEI_Config.isAdded) {
-            FMLInterModComms.sendRuntimeMessage(
-                    GT_Values.GT,
-                    "NEIPlugins",
-                    "register-crafting-handler",
-                    "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier());
-            GuiCraftingRecipe.craftinghandlers.add(this);
-            GuiUsageRecipe.usagehandlers.add(this);
-        }
-    }
-
-    @Override
-    public TemplateRecipeHandler newInstance() {
-        return new DigesterHandler(this.mRecipeMap);
-    }
-}
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java
deleted file mode 100644
index 81cb495a98..0000000000
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.elisis.gtnhlanth.xmod.nei;
-
-import codechicken.nei.recipe.GuiCraftingRecipe;
-import codechicken.nei.recipe.GuiUsageRecipe;
-import codechicken.nei.recipe.TemplateRecipeHandler;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.nei.GT_NEI_DefaultHandler;
-
-public class DisstankHandler extends GT_NEI_DefaultHandler {
-
-    public DisstankHandler(GT_Recipe_Map recipeMap) {
-        super(recipeMap);
-        if (!NEI_Config.isAdded) {
-            FMLInterModComms.sendRuntimeMessage(
-                    GT_Values.GT,
-                    "NEIPlugins",
-                    "register-crafting-handler",
-                    "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier());
-            GuiCraftingRecipe.craftinghandlers.add(this);
-            GuiUsageRecipe.usagehandlers.add(this);
-        }
-    }
-
-    @Override
-    public TemplateRecipeHandler newInstance() {
-        return new DisstankHandler(this.mRecipeMap);
-    }
-}
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
index 91cf489418..c6977b488a 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
@@ -6,8 +6,8 @@ import net.minecraft.nbt.NBTTagCompound;
 public class IMC {
 
     public static void IMCSender() {
-        sendHandler("com.elisis.gtnhlanth.xmod.nei.DigesterHandler", "gregtech:gt.blockmachines:10500");
-        sendHandler("com.elisis.gtnhlanth.xmod.nei.DisstankHandler", "gregtech:gt.blockmachines:10501");
+        sendHandler("gtnhlanth.recipe.digester", "gregtech:gt.blockmachines:10500");
+        sendHandler("gtnhlanth.recipe.disstank", "gregtech:gt.blockmachines:10501");
 
         sendCatalyst("gtnhlanth.recipe.digester", "gregtech:gt.blockmachines:10500");
         sendCatalyst("gtnhlanth.recipe.disstank", "gregtech:gt.blockmachines:10501");
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
index e678a85c36..f42c95c530 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
@@ -2,7 +2,6 @@ package com.elisis.gtnhlanth.xmod.nei;
 
 import codechicken.nei.api.IConfigureNEI;
 import com.elisis.gtnhlanth.Tags;
-import com.elisis.gtnhlanth.loader.RecipeAdder;
 
 public class NEI_Config implements IConfigureNEI {
 
@@ -21,8 +20,6 @@ public class NEI_Config implements IConfigureNEI {
     @Override
     public void loadConfig() {
         isAdded = false;
-        new DigesterHandler(RecipeAdder.instance.DigesterRecipes);
-        new DisstankHandler(RecipeAdder.instance.DissolutionTankRecipes);
         isAdded = true;
     }
 }