1 files changed, 8 insertions, 30 deletions

diff --git a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
index ac0e625e3f..589e45ad90 100644
--- a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
+++ b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
@@ -2,10 +2,9 @@ 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.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 
@@ -19,11 +18,10 @@ implements IConfigureNEI {
 	@Override
 	public synchronized void loadConfig() {
 
-		mUniqueRecipeMapHandling.add(CustomRecipeMap.sFissionFuelProcessing.mUnlocalizedName);
+		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.sChemicalDehydratorRecipes.mUnlocalizedName);
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sVacuumFurnaceRecipes.mUnlocalizedName);		
 
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mUnlocalizedName);
@@ -31,7 +29,7 @@ implements IConfigureNEI {
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mUnlocalizedName);
 		
 		// Custom Recipe Maps
-		Logger.INFO("NEI Registration: "+CustomRecipeMap.sMappings.size()+" CustomRecipeMaps");
+		/*Logger.INFO("NEI Registration: "+CustomRecipeMap.sMappings.size()+" CustomRecipeMaps");
 		for (final CustomRecipeMap tMap : CustomRecipeMap.sMappings) {
 			if (tMap.mNEIAllowed) {
 				if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) {
@@ -45,24 +43,6 @@ implements IConfigureNEI {
 			else {
 				Logger.INFO("NEI Registration: Not allowed to register NEI handler for "+tMap.mNEIName);				
 			}
-		}
-		
-		// Custom Recipe maps
-		/*Logger.INFO("NEI Registration: "+GTPP_Recipe.GTPP_Recipe_Map.sMappings.size()+" sMappings");
-		for (final GTPP_Recipe_Map tMap : GTPP_Recipe.GTPP_Recipe_Map.sMappings) {
-			if (tMap.mNEIAllowed) {				
-				if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) {
-					Logger.INFO("NEI Registration: Registering NEI handler for "+tMap.mNEIName);
-					//new GTPP_NEI_DefaultHandler_Fix(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);
-				
-			}
 		}*/
 		
 		// Standard GT Recipe Maps
@@ -71,7 +51,7 @@ implements IConfigureNEI {
 			if (tMap.mNEIAllowed) {				
 				if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) {
 					Logger.INFO("NEI Registration: Registering NEI handler for "+tMap.mNEIName);
-					new GT_NEI_DefaultHandler(tMap);					
+					new GTPP_NEI_DefaultHandler(tMap);					
 				}	
 				else {
 					Logger.INFO("NEI Registration: Not allowed to register NEI handler for "+tMap.mNEIName);					
@@ -89,17 +69,15 @@ implements IConfigureNEI {
 		new GT_NEI_FlotationCell();
 		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes.mNEIName);
 		new GT_NEI_VacFurnace();
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.mNEIName);
-		new GT_NEI_Dehydrator();
-		Logger.INFO("NEI Registration: Registering NEI handler for "+CustomRecipeMap.sFissionFuelProcessing.mNEIName);
+		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_DefaultHandler(GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT);					
+		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_DefaultHandler(GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT);					
+		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_DefaultHandler(GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT);					
+		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());