% 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.

7 files changed, 16 insertions, 16 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index c6593ea82e..bdb1837aa1 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -54,7 +54,7 @@ import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
 import gtPlusPlus.core.item.tool.staballoy.StaballoyAxe;
 import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.lib.CORE.ConfigSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
@@ -573,7 +573,7 @@ public final class ModItems {
 
 
 		//Load Tree Farmer
-		if (CORE.configSwitches.enableMultiblock_TreeFarmer){ //https://en.wikipedia.org/wiki/UAN
+		if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){ //https://en.wikipedia.org/wiki/UAN
 			dustFertUN18 = ItemUtils.generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0];
 			dustFertUN32 = ItemUtils.generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0];
 
@@ -645,10 +645,10 @@ public final class ModItems {
 		}
 
 		//A plate of Europium.
-		if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null) && CORE.configSwitches.enableCustom_Pipes){
+		if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null) && CORE.ConfigSwitches.enableCustom_Pipes){
 			itemPlateEuropium = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Europium));
 		}
-		if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) && CORE.configSwitches.enableCustom_Pipes){
+		if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) && CORE.ConfigSwitches.enableCustom_Pipes){
 			itemDoublePlateEuropium = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Europium));
 		}
 
@@ -801,7 +801,7 @@ public final class ModItems {
 
 
 		//Special Item Handling Case
-		if (configSwitches.enableAlternativeBatteryAlloy) {
+		if (ConfigSwitches.enableAlternativeBatteryAlloy) {
 			//ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", new short[]{35, 228, 141}, 0); TODO
 			ModItems.itemPlateBatteryAlloy = ItemUtils.generateSpecialUsePlate("BatteryAlloy", "Battery Alloy", new short[]{35, 228, 141}, 0);
 
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 80b48913d5..235d50ae36 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -59,7 +59,7 @@ public class BaseItemComponent extends Item{
 	}
 
 	public String getCorrectTextures(){
-		if (!CORE.configSwitches.useGregtechTextures){
+		if (!CORE.ConfigSwitches.useGregtechTextures){
 			return CORE.MODID + ":" + "item"+this.componentType.COMPONENT_NAME;
 		}
 		if (this.componentType == ComponentTypes.GEAR){
diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
index f5fff65882..f2228afb78 100644
--- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
+++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
@@ -48,7 +48,7 @@ public class BaseItemCell extends BaseItemComponent{
 	@Override
 	public void registerIcons(final IIconRegister i) {
 
-		if (CORE.configSwitches.useGregtechTextures){
+		if (CORE.ConfigSwitches.useGregtechTextures){
 			this.base = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "cell");
 			this.overlay = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "cell_OVERLAY");
 		}
@@ -64,10 +64,10 @@ public class BaseItemCell extends BaseItemComponent{
 
 	@Override
 	public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
-		if (renderPass == 0 && !CORE.configSwitches.useGregtechTextures){
+		if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures){
 			return Utils.rgbtoHexValue(230, 230, 230);
 		}
-		if (renderPass == 1 && CORE.configSwitches.useGregtechTextures){
+		if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures){
 			return Utils.rgbtoHexValue(230, 230, 230);
 		}
 		return this.componentColour;
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index d22e606e78..6aa1f54cc8 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -78,7 +78,7 @@ public class BaseItemDust extends Item{
 	}
 
 	private String getCorrectTexture(final String pileSize){
-		if (!CORE.configSwitches.useGregtechTextures){
+		if (!CORE.ConfigSwitches.useGregtechTextures){
 			if ((pileSize == "dust") || (pileSize == "Dust")){
 				this.setTextureName(CORE.MODID + ":" + "dust");}
 			else{
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index 93fc833c79..f19aaff4b3 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -85,7 +85,7 @@ public class BaseItemDustUnique extends Item{
 	}
 
 	private String getCorrectTexture(final String pileSize){
-		if (!CORE.configSwitches.useGregtechTextures){
+		if (!CORE.ConfigSwitches.useGregtechTextures){
 			if ((pileSize == "dust") || (pileSize == "Dust")){
 				this.setTextureName(CORE.MODID + ":" + "dust");}
 			else{
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index cd30fdd165..b6f139b74a 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -65,7 +65,7 @@ public class BaseItemIngotHot extends BaseItemIngot{
 	@Override
 	@SideOnly(Side.CLIENT)
 	public boolean requiresMultipleRenderPasses(){
-		if (CORE.configSwitches.useGregtechTextures){
+		if (CORE.ConfigSwitches.useGregtechTextures){
 			return true;
 		}
 		else {
@@ -76,7 +76,7 @@ public class BaseItemIngotHot extends BaseItemIngot{
 	@Override
 	public void registerIcons(final IIconRegister i) {
 
-		if (CORE.configSwitches.useGregtechTextures){
+		if (CORE.ConfigSwitches.useGregtechTextures){
 			this.base = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot");
 			this.overlay = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY");
 		}
@@ -89,10 +89,10 @@ public class BaseItemIngotHot extends BaseItemIngot{
 
 	@Override
 	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
-		if(pass == 0 && CORE.configSwitches.useGregtechTextures) {
+		if(pass == 0 && CORE.ConfigSwitches.useGregtechTextures) {
 			return this.base;
 		}
-		else if(pass == 1 && CORE.configSwitches.useGregtechTextures) {
+		else if(pass == 1 && CORE.ConfigSwitches.useGregtechTextures) {
 			return this.overlay;
 		}
 		else {
diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java b/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java
index 2c6479fbd4..cc73ba3d32 100644
--- a/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java
+++ b/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java
@@ -19,7 +19,7 @@ public class ItemsMultiTools {
 
 		//Load Multitools
 		final boolean gtStyleTools = LoadedMods.Gregtech;
-		if (CORE.configSwitches.enableMultiSizeTools){
+		if (CORE.ConfigSwitches.enableMultiSizeTools){
 
 			//GT Materials
 			final Materials[] rm = Materials.values();