% Major Refactor of the base GT++ class.

% Moved Config Handling to it's own class.
% Renamed configSwitches.class to ConfigSwitches.class.
+ Added framework for Segment Analytics.

6 files changed, 34 insertions, 34 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index c74603abc1..a333af99e7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1060,7 +1060,7 @@ public class RECIPES_GREGTECH {
 
 	private static void benderRecipes(){
 
-		if (CORE.configSwitches.enableMultiblock_PowerSubstation){
+		if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){
 			GT_Values.RA.addBenderRecipe(ItemUtils.getItemStackOfAmountFromOreDict("ingotVanadium", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateVanadium", 1), 8, 16);
 		}
 	}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index 1a9ae86c52..4f5cfd74e6 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -19,7 +19,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
 	public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) {
 		if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString())) {
 
-			if (CORE.configSwitches.enableCustomCircuits && !CORE.GTNH){
+			if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH){
 				if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilYttriumBariumCuprate", 1) != null){
 					GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.YttriumBariumCuprate, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), 64, 480);
 				}
@@ -45,7 +45,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
 
 
 		} else if (aOreDictName.equals(OreDictNames.craftingLensYellow.toString())) {
-			if (CORE.configSwitches.enableCustomCircuits && !CORE.GTNH){
+			if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH){
 				if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilOsmium", 1) != null){
 					GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_LuV.get(1L, new Object[0]), 64, 1024);
 				}
@@ -58,7 +58,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
 		} else if (aOreDictName.equals(OreDictNames.craftingLensCyan.toString())) {
 		} else if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) {
 		} else if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) {
-			if (CORE.configSwitches.enableCustomCircuits && !CORE.GTNH){
+			if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH){
 				if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilNaquadah", 1) != null){
 					GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_ZPM.get(1L, new Object[0]), 64, 2000);
 				}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index c644163331..14921c645e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -382,7 +382,7 @@ public class RECIPES_MachineComponents {
 	}
 
 	private static void GregtechMachinePhase(){
-		if (CORE.configSwitches.enableCustomCircuits && !CORE.GTNH){
+		if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH){
 			Utils.LOG_INFO("Adding Gregtech machine recipes for the circuits.");
 			GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_IV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), 32, 256);
 			GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_LuV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), 64, 512);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 60fa118b1d..9e408ff7d4 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -214,7 +214,7 @@ public class RECIPES_Machines {
 
 
 		}
-		if (CORE.configSwitches.enableMultiblock_IndustrialCokeOven){
+		if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven){
 			if(LoadedMods.Railcraft){
 				//Misc
 				INPUT_RCCokeOvenBlock = ItemUtils.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1);
@@ -367,7 +367,7 @@ public class RECIPES_Machines {
 					RECIPE_Buffer_MAX);
 
 			//Steam Condenser
-			if (CORE.configSwitches.enableMachine_SteamConverter ){
+			if (CORE.ConfigSwitches.enableMachine_SteamConverter ){
 				RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1);
 				RecipeUtils.addShapedGregtechRecipe(
 						pipeLargeCopper, pipeHugeSteel, pipeLargeCopper,
@@ -377,7 +377,7 @@ public class RECIPES_Machines {
 			}
 
 
-			if (CORE.configSwitches.enableMultiblock_IronBlastFurnace){
+			if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace){
 
 				RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1);
 				RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(Casing_Amount);
@@ -405,7 +405,7 @@ public class RECIPES_Machines {
 				GT_Values.RA.addArcFurnaceRecipe(RECIPE_IronPlatedBricks, new ItemStack[]{ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2)}, new int[]{0}, 32*20, 32);
 			}
 
-			if (CORE.configSwitches.enableMultiblock_IndustrialCentrifuge){
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge){
 				//Industrial Centrifuge
 				RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1);
 				RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(Casing_Amount);
@@ -424,7 +424,7 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialCentrifugeCasing);
 			}
 
-			if (CORE.configSwitches.enableMultiblock_IndustrialCokeOven){
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven){
 				//Industrial Coke Oven
 				RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1);
 				RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(Casing_Amount);
@@ -467,7 +467,7 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialCokeOvenCasingB);
 			}
 
-			if (CORE.configSwitches.enableMultiblock_IndustrialElectrolyzer){
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer){
 				//Industrial Electrolyzer
 				RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1);
 				RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(Casing_Amount);
@@ -486,7 +486,7 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialElectrolyzerController);
 			}
 
-			if (CORE.configSwitches.enableMultiblock_IndustrialPlatePress){
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress){
 				//Industrial Material Press
 				RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1);
 				RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(Casing_Amount);
@@ -505,7 +505,7 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialMaterialPressController);
 			}
 
-			if (CORE.configSwitches.enableMultiblock_IndustrialMacerationStack){
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack){
 				//Industrial Maceration Stack
 				RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1);
 				RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(Casing_Amount);
@@ -524,7 +524,7 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialMacerationStackController);
 			}
 
-			if (CORE.configSwitches.enableMultiblock_IndustrialWireMill){
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill){
 				//Industrial Wire Factory
 				RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1);
 				RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(Casing_Amount);
@@ -546,7 +546,7 @@ public class RECIPES_Machines {
 
 
 			//Tiered Tanks
-			if (CORE.configSwitches.enableMachine_FluidTanks){
+			if (CORE.ConfigSwitches.enableMachine_FluidTanks){
 				Utils.LOG_WARNING("Is New Horizons Loaded? "+CORE.GTNH);
 				if (!CORE.GTNH){
 					RecipeUtils.addShapedGregtechRecipe(
@@ -640,7 +640,7 @@ public class RECIPES_Machines {
 				}
 			}
 
-			if (CORE.configSwitches.enableMultiblock_MultiTank){
+			if (CORE.ConfigSwitches.enableMultiblock_MultiTank){
 				//Industrial Multi Tank
 				RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1);
 				RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(Casing_Amount);
@@ -680,7 +680,7 @@ public class RECIPES_Machines {
 							mSemiFluidgen, Character.valueOf('G'),
 							OrePrefixes.gearGt.get(Materials.StainlessSteel) });
 
-			if (CORE.configSwitches.enableMultiblock_AlloyBlastSmelter){
+			if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter){
 				//Industrial Blast Smelter
 				RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1);
 				RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(Casing_Amount);
@@ -706,7 +706,7 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialBlastSmelterCoil);
 			}
 
-			if (CORE.configSwitches.enableMultiblock_MatterFabricator){
+			if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator){
 				//Industrial Matter Fabricator
 				RECIPE_IndustrialMatterFabController = GregtechItemList.Industrial_MassFab.get(1);
 				RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(Casing_Amount);
@@ -732,7 +732,7 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialMatterFabCoil);
 			}
 
-			if (CORE.configSwitches.enableMultiblock_IndustrialSifter){
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter){
 				//Industrial Sieve
 				RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1);
 				RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(Casing_Amount);
@@ -758,7 +758,7 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialSieveGrate);
 			}
 
-			if (CORE.configSwitches.enableMultiblock_TreeFarmer){
+			if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){
 				//Industrial Tree Farmer
 				RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1);
 				RECIPE_TreeFarmFrame = GregtechItemList.TreeFarmer_Structural.get(Casing_Amount);
@@ -776,7 +776,7 @@ public class RECIPES_Machines {
 						RECIPE_TreeFarmFrame);
 			}
 
-			if (CORE.configSwitches.enableMachine_Tesseracts){
+			if (CORE.ConfigSwitches.enableMachine_Tesseracts){
 				//Tesseracts
 				RECIPE_TesseractGenerator = GregtechItemList.GT4_Tesseract_Generator.get(1);
 				RECIPE_TesseractTerminal = GregtechItemList.GT4_Tesseract_Terminal.get(1);
@@ -794,10 +794,10 @@ public class RECIPES_Machines {
 						RECIPE_TesseractTerminal);
 			}
 
-			if (CORE.configSwitches.enableMachine_SimpleWasher){
+			if (CORE.ConfigSwitches.enableMachine_SimpleWasher){
 				ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1);
 				ItemStack washerPipe;
-				if (CORE.configSwitches.enableCustom_Pipes){
+				if (CORE.ConfigSwitches.enableCustom_Pipes){
 					washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1);
 				}
 				else {
@@ -811,7 +811,7 @@ public class RECIPES_Machines {
 						GregtechItemList.SimpleDustWasher.get(1));
 			}
 
-			if (CORE.configSwitches.enableMachine_Pollution && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+			if (CORE.ConfigSwitches.enableMachine_Pollution && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 				RecipeUtils.addShapedGregtechRecipe(
 						"plateCarbon", "plateCarbon", "plateCarbon",
 						"dustCarbon", "dustCarbon", "dustCarbon",
@@ -895,7 +895,7 @@ public class RECIPES_Machines {
 
 			}
 
-			if (CORE.configSwitches.enableMultiblock_ThermalBoiler){
+			if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler){
 				RECIPE_ThermalBoilerController = GregtechItemList.GT4_Thermal_Boiler.get(1);
 				RECIPE_ThermalBoilerCasing = GregtechItemList.Casing_ThermalContainment.get(4);
 				ItemStack centrifugeHV = ItemList.Machine_HV_Centrifuge.get(1);
@@ -922,7 +922,7 @@ public class RECIPES_Machines {
 				GT_Values.RA.addAssemblerRecipe(ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemPartCarbonMesh", "RawCarbonMesh", 0, 16), CI.getNumberedCircuit(18), ItemUtils.getSimpleStack(ModItems.itemLavaFilter), 80*20, 16);
 			}
 
-			if (CORE.configSwitches.enableMultiblock_LiquidFluorideThoriumReactor){
+			if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor){
 
 				//Thorium Reactor
 				RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);
@@ -963,7 +963,7 @@ public class RECIPES_Machines {
 
 				ItemStack mInnerTank;
 
-				if (CORE.GTNH || !CORE.configSwitches.enableMachine_FluidTanks){
+				if (CORE.GTNH || !CORE.ConfigSwitches.enableMachine_FluidTanks){
 					mInnerTank = ItemList.Quantum_Tank_LV.get(1);
 				}
 				else {
@@ -1001,7 +1001,7 @@ public class RECIPES_Machines {
 
 			}
 
-			if (CORE.configSwitches.enableMultiblock_PowerSubstation){
+			if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){
 				RecipeUtils.recipeBuilder(
 						null, "plateIncoloy020", null,
 						"plateIncoloy020", "frameGtIncoloyMA956", "plateIncoloy020",
@@ -1015,7 +1015,7 @@ public class RECIPES_Machines {
 						GregtechItemList.PowerSubStation.get(1));
 			}
 			
-			if (CORE.configSwitches.enableMultiblock_IndustrialThermalCentrifuge){
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge){
 				RecipeUtils.recipeBuilder(
 						"plateRedSteel", CI.craftingToolHammer_Hard, "plateRedSteel",
 						"plateRedSteel", "frameGtBlackSteel", "plateRedSteel",
@@ -1029,7 +1029,7 @@ public class RECIPES_Machines {
 						GregtechItemList.Industrial_ThermalCentrifuge.get(1));
 			}
 			
-			if (CORE.configSwitches.enableMultiblock_IndustrialWashPlant){
+			if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant){
 				RecipeUtils.recipeBuilder(
 						"plateGrisium", CI.craftingToolHammer_Hard, "plateGrisium",
 						"plateTalonite", "frameGtGrisium", "plateTalonite",
@@ -1043,7 +1043,7 @@ public class RECIPES_Machines {
 						GregtechItemList.Industrial_WashPlant.get(1));
 			}
 			
-			if (CORE.configSwitches.enableMultiblock_LargeAutoCrafter){
+			if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter){
 				RecipeUtils.recipeBuilder(
 						"plateStainlessSteel", CI.craftingToolHammer_Hard, "plateStainlessSteel",
 						"plateStellite", "frameGtStainlessSteel", "plateStellite",
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
index f4be860e36..446f1a1414 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
@@ -274,7 +274,7 @@ public class RECIPES_Old_Circuits  implements IOreRecipeRegistrator {
 
 	private static boolean hideCircuitsNEI(){
 		Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems");
-		if (isNEILoaded && !CORE.configSwitches.showHiddenNEIItems){
+		if (isNEILoaded && !CORE.ConfigSwitches.showHiddenNEIItems){
 			Utils.LOG_INFO("[Old Feature - Circuits] Hiding .28+ circuits in NEI.");
 			String[] CircuitToHide = {
 					"Circuit_Board_Basic",
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 1ac0f61c84..2d857ca25a 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -255,7 +255,7 @@ public class CI {
 	}	
 
 	public static Object getTieredCircuit(int tier){
-		if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+		if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 			if (tier == 0){
 				return GregtechItemList.Old_Circuit_Primitive.get(1);
 			}
@@ -405,7 +405,7 @@ public class CI {
 	}
 
 	public static ItemStack getDataOrb(){
-		if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+		if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 			return GregtechItemList.Old_Tool_DataOrb.get(1);
 		}
 		else {