Remove reference to GT++ recipes

2 files changed, 27 insertions, 4 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
index 1e6f2e6d2c..b973aec26a 100644
--- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
+++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
@@ -19,6 +19,9 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;

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

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

+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;

+import cpw.mods.fml.common.event.FMLServerStartedEvent;

+import cpw.mods.fml.common.event.FMLServerStartingEvent;

 import gregtech.api.util.GT_Log;

 

 @Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, 

@@ -67,12 +70,13 @@ public class GTNHLanthanides {
         

         

         

+        

     }

     

     @EventHandler

     public static void onModLoadingComplete(FMLLoadCompleteEvent e) {

     	GT_Log.out.print("AAAAAAAAAAAAAA");

-    	RecipeLoader.removeCeriumSources();

+    	//

     	GT_Log.out.print("We are done loading");

     	BotRecipes.removeRecipes();

     	

@@ -80,5 +84,16 @@ public class GTNHLanthanides {
     	

     }

     

+    // This is horrifying and I'm sorry

+    @EventHandler

+    public static void onServerAboutToStart(FMLServerAboutToStartEvent e) {

+    	//RecipeLoader.removeCeriumSources();

+    }

+    

+    @EventHandler

+    public static void onServerStart(FMLServerStartedEvent e) {

+    	RecipeLoader.removeCeriumSources();

+    }

+    

 

 }

diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index fcecb62e13..8e723c7a3b 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -1,5 +1,6 @@
 package com.elisis.gtnhlanth.loader;
 
+import java.util.Arrays;
 import java.util.HashSet;
 
 import com.elisis.gtnhlanth.Tags;
@@ -1293,7 +1294,8 @@ public class RecipeLoader {
 
         GT_Log.out.print("Electrolyzer done!\n");
         
-
+        /*
+        //TODO: This entire block is highly questionable because GT++ doesn't always load predictably
         if (LoadedList.GTPP) {
             //For Multi Centrifuge
             //Blame alk. She made some shit in it, NEI will break down if anyone modify the hash list directly.
@@ -1338,7 +1340,10 @@ public class RecipeLoader {
             
             //Dehydrator
             for (GT_Recipe recipe : GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.mRecipeList) {
+            	GT_Log.out.print(Arrays.toString(recipe.mInputs));
             	ItemStack input = recipe.mInputs[0];
+            	
+            	
             	if (GT_Utility.isStackValid(input)) {
             		GT_Recipe tRecipe = recipe.copy();
             		for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -1353,10 +1358,12 @@ public class RecipeLoader {
                     }
                     break;
             	}         	
+            	
             }
+            
             GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.mRecipeList.removeAll(remove);
-            GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList.addAll(reAdd);
-            GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.reInit();
+            GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.mRecipeList.addAll(reAdd);
+            GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.reInit();
             
             GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! ");
             
@@ -1368,6 +1375,7 @@ public class RecipeLoader {
             
             
         }
+        */
 
         //For ByProduct List
         for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sByProductList.mRecipeList) {