$ Fixed a order of operation bug, where recipe removal of new circuits wouldn't occur, as the variables it checked to see if the option was enabled were loaded after the recipe map edit.

+ Attempted to override the list of GT circuits with my own, to prevent NEI clutter.

3 files changed, 36 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index db7699049c..7ce6ceb827 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -176,6 +176,10 @@ public class GTplusplus implements ActionListener {
 	@Mod.EventHandler
 	public void preInit(final FMLPreInitializationEvent event) {
 		Utils.LOG_INFO("Loading " + CORE.name + " V" + CORE.VERSION);
+		
+		// Handle GT++ Config
+		handleConfigFile(event);
+		
 		CORE.DEVENV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
 		Utils.LOG_INFO("Latest is " + CORE.MASTER_VERSION + ". Updated? " + Utils.isModUpToDate());
 		Utils.LOG_INFO("User's Country: " + CORE.USER_COUNTRY);
@@ -184,13 +188,10 @@ public class GTplusplus implements ActionListener {
 		FMLCommonHandler.instance().bus().register(new LoginEventHandler());
 		Utils.LOG_INFO("Login Handler Initialized");
 
-		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && CORE.configSwitches.enableOldGTcircuits){
+		if (CORE.configSwitches.enableOldGTcircuits){
 			removeCircuitRecipeMap(); //Bye shitty recipes.			
 		}
-
-		// Handle GT++ Config
-		handleConfigFile(event);
-
+		
 		// HANDLER_GT.mMaterialProperties = new GT_Config(new Configuration(new
 		// File(new File(event.getModConfigurationDirectory(), "GTplusplus"),
 		// "MaterialProperties.cfg")));
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
index bf5f6dfdd8..b284ecac7e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
@@ -75,5 +75,31 @@ public class RECIPES_Old_Circuits  implements IOreRecipeRegistrator {
 	    
 		return true;
 	}
+	
+	public static boolean removeNewCircuits(){
+		
+		ItemList.Circuit_Primitive.set(GregtechItemList.Old_Circuit_Primitive.get(1));
+		ItemList.Circuit_Basic.set(GregtechItemList.Old_Circuit_Basic.get(1));
+		ItemList.Circuit_Integrated_Good.set(GregtechItemList.Old_Circuit_Good.get(1));
+		ItemList.Circuit_Good.set(GregtechItemList.Old_Circuit_Good.get(1));
+		ItemList.Circuit_Advanced.set(GregtechItemList.Old_Circuit_Advanced.get(1));
+		ItemList.Circuit_Data.set(GregtechItemList.Old_Circuit_Data.get(1));
+		ItemList.Circuit_Elite.set(GregtechItemList.Old_Circuit_Elite.get(1));
+		ItemList.Circuit_Master.set(GregtechItemList.Old_Circuit_Master.get(1));
+		ItemList.Circuit_Ultimate.set(GregtechItemList.Old_Circuit_Ultimate.get(1));
+		
+		
+		ItemList.Circuit_Board_Basic.set(GregtechItemList.Old_Circuit_Board_Basic.get(1));
+		ItemList.Circuit_Board_Advanced.set(GregtechItemList.Old_Circuit_Board_Advanced.get(1));
+		ItemList.Circuit_Board_Elite.set(GregtechItemList.Old_Circuit_Board_Elite.get(1));
+		ItemList.Circuit_Parts_Advanced.set(GregtechItemList.Old_Circuit_Parts_Advanced.get(1));
+		ItemList.Circuit_Parts_Wiring_Basic.set(GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1));
+		ItemList.Circuit_Parts_Wiring_Advanced.set(GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(1));
+		ItemList.Circuit_Parts_Wiring_Elite.set(GregtechItemList.Old_Circuit_Parts_Wiring_Elite.get(1));
+		ItemList.Circuit_Parts_Crystal_Chip_Elite.set(GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1));
+		ItemList.Circuit_Parts_Crystal_Chip_Master.set(GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(1));
+		
+		return true;
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index d2703d7958..fb6aa9991d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -277,7 +277,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
 
 		//Add the old recipes.
 		new RECIPES_Old_Circuits();
-		RECIPES_Old_Circuits.addCircuitRecipes();
 		Utils.LOG_INFO("[Old Feature] Enabling Pre 5.09.28 circuits & recipes.");
 
 		Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems");
@@ -372,7 +371,10 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
 
 			for (String component : CircuitToHide){
 				API.hideItem(ItemList.valueOf(component).get(1L, new Object[0]));
-			}			
+			}
+			
+
+			RECIPES_Old_Circuits.removeNewCircuits();
 		}
 
 		return true;