1 files changed, 49 insertions, 21 deletions

diff --git a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
index 514612752d..589e45ad90 100644
--- a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
+++ b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
@@ -2,59 +2,87 @@ package gtPlusPlus.nei;
 
 import codechicken.nei.api.API;
 import codechicken.nei.api.IConfigureNEI;
-import gregtech.api.util.CustomRecipeMap;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
-import gregtech.nei.GT_NEI_DefaultHandler;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 
 public class NEI_GT_Config
 implements IConfigureNEI {
-	public static boolean sIsAdded = true;
+	
+	public static boolean sIsAdded = false;
 	
 	private static final AutoMap<String> mUniqueRecipeMapHandling = new AutoMap<String>();
-
+	
 	@Override
 	public synchronized void loadConfig() {
-		sIsAdded = false;
 
+		mUniqueRecipeMapHandling.add(GTPP_Recipe.GTPP_Recipe_Map.sFissionFuelProcessing.mUnlocalizedName);
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sChemicalPlantRecipes.mUnlocalizedName);
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sOreMillRecipes.mUnlocalizedName);
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sFlotationCellRecipes.mUnlocalizedName);
-		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sVacuumFurnaceRecipes.mUnlocalizedName);
+		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sVacuumFurnaceRecipes.mUnlocalizedName);		
+
+		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mUnlocalizedName);
+		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mUnlocalizedName);
+		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mUnlocalizedName);
 		
 		// Custom Recipe Maps
+		/*Logger.INFO("NEI Registration: "+CustomRecipeMap.sMappings.size()+" CustomRecipeMaps");
 		for (final CustomRecipeMap tMap : CustomRecipeMap.sMappings) {
 			if (tMap.mNEIAllowed) {
-				new GTPP_NEI_CustomMapHandler(tMap);
-			}
-		}
-		
-		// Custom Recipe maps
-		for (final GTPP_Recipe_Map tMap : GTPP_Recipe.GTPP_Recipe_Map.sMappings) {
-			if (tMap.mNEIAllowed) {				
 				if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) {
-					new GTPP_NEI_DefaultHandler(tMap);					
-				}				
+					Logger.INFO("NEI Registration: Registering NEI handler for "+tMap.mNEIName);
+					new GTPP_NEI_CustomMapHandler(tMap);
+				}	
+				else {
+					Logger.INFO("NEI Registration: Not allowed to register NEI handler for "+tMap.mNEIName);					
+				}
 			}
-		}
+			else {
+				Logger.INFO("NEI Registration: Not allowed to register NEI handler for "+tMap.mNEIName);				
+			}
+		}*/
 		
 		// Standard GT Recipe Maps
+		Logger.INFO("NEI Registration: "+GTPP_Recipe.GTPP_Recipe_Map_Internal.sMappingsEx.size()+" sMappingEx");
 		for (final GT_Recipe_Map tMap : GTPP_Recipe.GTPP_Recipe_Map_Internal.sMappingsEx) {
 			if (tMap.mNEIAllowed) {				
 				if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) {
-					new GT_NEI_DefaultHandler(tMap);					
-				}				
+					Logger.INFO("NEI Registration: Registering NEI handler for "+tMap.mNEIName);
+					new GTPP_NEI_DefaultHandler(tMap);					
+				}	
+				else {
+					Logger.INFO("NEI Registration: Not allowed to register NEI handler for "+tMap.mNEIName);					
+				}			
+			}
+			else {
+				Logger.INFO("NEI Registration: Skipping registration of NEI handler for "+tMap.mNEIName);
 			}
 		}
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.mNEIName);
 		new GT_NEI_FluidReactor();
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sOreMillRecipes.mNEIName);
 		new GT_NEI_MillingMachine();
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sFlotationCellRecipes.mNEIName);
 		new GT_NEI_FlotationCell();
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes.mNEIName);
 		new GT_NEI_VacFurnace();
-		sIsAdded = true;
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sFissionFuelProcessing.mNEIName);
+		new GT_NEI_RFPP();
+
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mNEIName);
+		new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT);					
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mNEIName);
+		new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT);					
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mNEIName);
+		new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT);		
+		
+		Logger.INFO("NEI Registration: Registering NEI handler for "+DecayableRecipeHandler.mNEIName);
 		API.registerRecipeHandler(new DecayableRecipeHandler());
 		API.registerUsageHandler(new DecayableRecipeHandler());
+		sIsAdded = true;
 	}
 
 	@Override
@@ -64,6 +92,6 @@ implements IConfigureNEI {
 
 	@Override
 	public String getVersion() {
-		return "(1.01)";
+		return "(1.12)";
 	}
 }