Add NEI catalysts (#179)

* Add NEI catalysts

* Comment out Compound Fabricator

3 files changed, 78 insertions, 32 deletions

diff --git a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java
index ce2062d12c..04d1a201a5 100644
--- a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java
+++ b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java
@@ -46,7 +46,7 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler {
 	}
 
 	public void loadTransferRects() {
-		this.transferRects.add(new RecipeTransferRect(new Rectangle(6, 3, 16, 16), "GTPP_Decayables", new Object[0]));
+		this.transferRects.add(new RecipeTransferRect(new Rectangle(6, 3, 16, 16), getOverlayIdentifier(), new Object[0]));
 	}
 
 	public void loadCraftingRecipes(ItemStack result) {
diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java
index 5b8451b6b5..2352dce947 100644
--- a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java
+++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java
@@ -68,7 +68,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
 	}
 
 	public void loadTransferRects() {
-		this.transferRects.add(new RecipeTransferRect(new Rectangle(72, 14, 22, 16), getRecipeName(), new Object[0]));
+		this.transferRects.add(new RecipeTransferRect(new Rectangle(72, 14, 22, 16), getOverlayIdentifier(), new Object[0]));
 	}
     
     public List<GasSpargingRecipeNEI> getCache() {
diff --git a/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java
index 4b8abc09ed..9edb9992ca 100644
--- a/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java
+++ b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java
@@ -1,48 +1,82 @@
 package gtPlusPlus.nei;
 
 import cpw.mods.fml.common.event.FMLInterModComms;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class NEI_IMC_Sender {
     public static void IMCSender() {
-        setNBTInfoAndSendIt("gtpp.recipe.alloyblastsmelter", "gregtech:gt.blockmachines:810", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.rocketenginefuel", "gregtech:gt.blockmachines:793");
-        setNBTInfoAndSendIt("gtpp.recipe.cyclotron", "gregtech:gt.blockmachines:828");
-        setNBTInfoAndSendIt("gtpp.recipe.chemicaldehydrator", "gregtech:gt.blockmachines:911", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.slowfusionreactor", "gregtech:gt.blockmachines:31015");
-        setNBTInfoAndSendIt("gtpp.recipe.RTGgenerators", "gregtech:gt.blockmachines:869");
-        setNBTInfoAndSendIt("gtpp.recipe.cokeoven", "gregtech:gt.blockmachines:791");
-        setNBTInfoAndSendIt("gtpp.recipe.semifluidgeneratorfuels", "gregtech:gt.blockmachines:837");
-        setNBTInfoAndSendIt("gtpp.recipe.fishpond", "gregtech:gt.blockmachines:829", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.multimixer", "gregtech:gt.blockmachines:811");
-        setNBTInfoAndSendIt("gtpp.recipe.advanced.mixer", "gregtech:gt.blockmachines:811");
-        setNBTInfoAndSendIt("gtpp.recipe.cryogenicfreezer", "gregtech:gt.blockmachines:910");
-        setNBTInfoAndSendIt("gtpp.recipe.geothermalfuel", "gregtech:gt.blockmachines:830");
-        setNBTInfoAndSendIt("gtpp.recipe.matterfab2", "gregtech:gt.blockmachines:799");
-        setNBTInfoAndSendIt("gtpp.recipe.multicentrifuge", "gregtech:gt.blockmachines:790", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.multielectro", "gregtech:gt.blockmachines:796", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.simplewasher", "gregtech:gt.blockmachines:767");
-        setNBTInfoAndSendIt("gtpp.recipe.vacfurnace", "gregtech:gt.blockmachines:995", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.thermalgeneratorfuel", "gregtech:gt.blockmachines:875", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.solartower", "gregtech:gt.blockmachines:863", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.fissionfuel", "gregtech:gt.blockmachines:835", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.lftr", "gregtech:gt.blockmachines:751", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.lftr.sparging", "gregtech:gt.blockmachines:31035", 1);
-        setNBTInfoAndSendIt("gtpp.recipe.coldtrap", "gregtech:gt.blockmachines:31034");
-        setNBTInfoAndSendIt("gtpp.recipe.reactorprocessingunit", "gregtech:gt.blockmachines:31032");
-        setNBTInfoAndSendIt("gtpp.recipe.treefarm", "gregtech:gt.blockmachines:836");
+        sendHandler("gtpp.recipe.alloyblastsmelter", "gregtech:gt.blockmachines:810", 1);
+        sendHandler("gtpp.recipe.rocketenginefuel", "gregtech:gt.blockmachines:793");
+        sendHandler("gtpp.recipe.cyclotron", "gregtech:gt.blockmachines:828");
+        sendHandler("gtpp.recipe.chemicaldehydrator", "gregtech:gt.blockmachines:911", 1);
+        sendHandler("gtpp.recipe.slowfusionreactor", "gregtech:gt.blockmachines:31015");
+        sendHandler("gtpp.recipe.RTGgenerators", "gregtech:gt.blockmachines:869");
+        sendHandler("gtpp.recipe.cokeoven", "gregtech:gt.blockmachines:791");
+        sendHandler("gtpp.recipe.semifluidgeneratorfuels", "gregtech:gt.blockmachines:837");
+        sendHandler("gtpp.recipe.fishpond", "gregtech:gt.blockmachines:829", 1);
+        sendHandler("gtpp.recipe.multimixer", "gregtech:gt.blockmachines:811");
+        sendHandler("gtpp.recipe.advanced.mixer", "gregtech:gt.blockmachines:811");
+        sendHandler("gtpp.recipe.cryogenicfreezer", "gregtech:gt.blockmachines:910");
+        sendHandler("gtpp.recipe.geothermalfuel", "gregtech:gt.blockmachines:830");
+        sendHandler("gtpp.recipe.matterfab2", "gregtech:gt.blockmachines:799");
+        sendHandler("gtpp.recipe.multicentrifuge", "gregtech:gt.blockmachines:790", 1);
+        sendHandler("gtpp.recipe.multielectro", "gregtech:gt.blockmachines:796", 1);
+        sendHandler("gtpp.recipe.simplewasher", "gregtech:gt.blockmachines:767");
+        sendHandler("gtpp.recipe.vacfurnace", "gregtech:gt.blockmachines:995", 1);
+        sendHandler("gtpp.recipe.thermalgeneratorfuel", "gregtech:gt.blockmachines:875", 1);
+        sendHandler("gtpp.recipe.solartower", "gregtech:gt.blockmachines:863", 1);
+        sendHandler("gtpp.recipe.fissionfuel", "gregtech:gt.blockmachines:835", 1);
+        sendHandler("gtpp.recipe.lftr", "gregtech:gt.blockmachines:751", 1);
+        sendHandler("gtpp.recipe.lftr.sparging", "gregtech:gt.blockmachines:31035", 1);
+        sendHandler("gtpp.recipe.coldtrap", "gregtech:gt.blockmachines:31034");
+        sendHandler("gtpp.recipe.reactorprocessingunit", "gregtech:gt.blockmachines:31032");
+        sendHandler("gtpp.recipe.treefarm", "gregtech:gt.blockmachines:836");
         if (LoadedMods.AdvancedSolarPanel) {
-        	setNBTInfoAndSendIt("gtpp.recipe.moleculartransformer", "AdvancedSolarPanel:BlockMolecularTransformer");
+        	sendHandler("gtpp.recipe.moleculartransformer", "AdvancedSolarPanel:BlockMolecularTransformer");
+        }
+
+        sendCatalyst("GTPP_Decayables", "miscutils:blockDecayablesChest");
+        sendCatalyst("gtpp.recipe.geothermalfuel", "gregtech:gt.blockmachines:830");
+        sendCatalyst("gtpp.recipe.thermalgeneratorfuel", "gregtech:gt.blockmachines:875");
+        sendCatalyst("gtpp.recipe.solartower", "gregtech:gt.blockmachines:863");
+        sendCatalyst("gtpp.recipe.coldtrap", "gregtech:gt.blockmachines:31033");
+        sendCatalyst("gtpp.recipe.coldtrap", "gregtech:gt.blockmachines:31034");
+        sendCatalyst("gtpp.recipe.reactorprocessingunit", "gregtech:gt.blockmachines:31031");
+        sendCatalyst("gtpp.recipe.reactorprocessingunit", "gregtech:gt.blockmachines:31032");
+        sendCatalyst("gtpp.recipe.treefarm", "gregtech:gt.blockmachines:836");
+        sendCatalyst("gt.recipe.replicator", "gregtech:gt.blockmachines:31050");
+        sendCatalyst("gt.recipe.gasturbinefuel", "gregtech:gt.blockmachines:31073", -20);
+        sendCatalyst("gt.recipe.plasmageneratorfuels", "gregtech:gt.blockmachines:31074", -20);
+        sendCatalyst("gt.recipe.hammer", "gregtech:gt.blockmachines:31075");
+        sendCatalyst("gt.recipe.fluidheater", "gregtech:gt.blockmachines:31077");
+        sendCatalyst("gt.recipe.compressor", "gregtech:gt.blockmachines:31078");
+        sendCatalyst("crafting", "gregtech:gt.blockmachines:31081", -10);
+        sendCatalyst("crafting", "gregtech:gt.blockmachines:31082", -10);
+        sendCatalyst("crafting", "gregtech:gt.blockmachines:31091", -10);
+        sendCatalyst("crafting", "gregtech:gt.blockmachines:31092", -10);
+        sendCatalyst("crafting", "gregtech:gt.blockmachines:31093", -10);
+        sendCatalyst("crafting", "gregtech:gt.blockmachines:31094", -10);
+        sendCatalyst("crafting", "gregtech:gt.blockmachines:31095", -10);
+        sendCatalyst("crafting", "gregtech:gt.blockmachines:31096", -10);
+        sendCatalyst("crafting", "gregtech:gt.blockmachines:31097", -10);
+        sendCatalyst("crafting", "gregtech:gt.blockmachines:31098", -10);
+//        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+//            // Compound Fabricator
+//            sendCatalyst("gt.recipe.fakeAssemblylineProcess", "gregtech:gt.blockmachines:31024");
+//        }
+        if (LoadedMods.AdvancedSolarPanel) {
+            sendCatalyst("gtpp.recipe.moleculartransformer", "gregtech:gt.blockmachines:31072");
         }
     }
 
 
-    private static void setNBTInfoAndSendIt(String aRecipeName, String aBlock) {
-    	setNBTInfoAndSendIt(aRecipeName, aBlock, 2);
+    private static void sendHandler(String aRecipeName, String aBlock) {
+    	sendHandler(aRecipeName, aBlock, 2);
     }
     
-    private static void setNBTInfoAndSendIt(String aRecipeName, String aBlock, int aRecipesPerPage) {
+    private static void sendHandler(String aRecipeName, String aBlock, int aRecipesPerPage) {
         NBTTagCompound aNBT = new NBTTagCompound();
         aNBT.setString("handler", aRecipeName);
         aNBT.setString("modName", "GT++");
@@ -55,4 +89,16 @@ public class NEI_IMC_Sender {
         aNBT.setInteger("maxRecipesPerPage", aRecipesPerPage);
         FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
     }
+
+    private static void sendCatalyst(String aName, String aStack, int aPriority) {
+        NBTTagCompound aNBT = new NBTTagCompound();
+        aNBT.setString("handlerID", aName);
+        aNBT.setString("itemName", aStack);
+        aNBT.setInteger("priority", aPriority);
+        FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT);
+    }
+
+    private static void sendCatalyst(String aName, String aStack) {
+        sendCatalyst(aName, aStack, 0);
+    }
 }