aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/common
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2017-12-10 15:37:46 +1000
committerJordan Byrne <draknyte1@hotmail.com>2017-12-10 15:37:46 +1000
commit5a90d0ab107b4711b2b22aa3b2964ce7d669a216 (patch)
treed9ea8d2b4382f942ee08b9f52499f3bf20b6ed7f /src/Java/gtPlusPlus/core/common
parent27c1a066d6aaa2c3c8f3847909323c78ab693e37 (diff)
downloadGT5-Unofficial-5a90d0ab107b4711b2b22aa3b2964ce7d669a216.tar.gz
GT5-Unofficial-5a90d0ab107b4711b2b22aa3b2964ce7d669a216.tar.bz2
GT5-Unofficial-5a90d0ab107b4711b2b22aa3b2964ce7d669a216.zip
% 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.
Diffstat (limited to 'src/Java/gtPlusPlus/core/common')
-rw-r--r--src/Java/gtPlusPlus/core/common/CommonProxy.java6
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java4
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java4
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java4
4 files changed, 9 insertions, 9 deletions
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 10602c613e..1360932dfb 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -13,7 +13,7 @@ import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler;
import gtPlusPlus.core.handler.events.ZombieBackupSpawnEventHandler;
import gtPlusPlus.core.item.ModItems;
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.recipe.RECIPES_Old_Circuits;
import gtPlusPlus.core.recipe.common.CI;
@@ -94,7 +94,7 @@ public class CommonProxy {
//Handles Custom tooltips for EIO.
Utils.registerEvent(new HandlerTooltip_EIO());
- if (configSwitches.disableZombieReinforcement){
+ if (ConfigSwitches.disableZombieReinforcement){
//Make Zombie reinforcements fuck off.
Utils.registerEvent(new ZombieBackupSpawnEventHandler());
}
@@ -117,7 +117,7 @@ public class CommonProxy {
PlayerCache.initCache();
//Circuits
- if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+ if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
RECIPES_Old_Circuits.handleCircuits();
new RECIPES_Old_Circuits();
}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
index d8ff219db7..763ae3f283 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
@@ -1,6 +1,6 @@
package gtPlusPlus.core.common.compat;
-import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.lib.CORE.ConfigSwitches;
import gtPlusPlus.core.recipe.RECIPES_Tools;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.recipe.RecipeUtils;
@@ -18,7 +18,7 @@ public class COMPAT_ExtraUtils {
ItemUtils.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0);
//GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium));
- if (configSwitches.enableAlternativeDivisionSigilRecipe){
+ if (ConfigSwitches.enableAlternativeDivisionSigilRecipe){
//Division Sigil
RecipeUtils.recipeBuilder(
"plateNetherStar", "gemIridium", "plateNetherStar",
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index ce62eaac5a..74e6d931fd 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.common.compat;
import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
-import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.lib.CORE.ConfigSwitches;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.ShapedRecipeObject;
import gtPlusPlus.core.util.item.ItemUtils;
@@ -37,7 +37,7 @@ public class COMPAT_IC2 {
private static final void run(){
- if (configSwitches.disableIC2Recipes){
+ if (ConfigSwitches.disableIC2Recipes){
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
index a257766e38..4fcce4013d 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
@@ -1,7 +1,7 @@
package gtPlusPlus.core.common.compat;
import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.lib.CORE.ConfigSwitches;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.item.ItemUtils;
@@ -9,7 +9,7 @@ public class COMPAT_Thaumcraft {
public static void OreDict(){
- if (configSwitches.enableThaumcraftShardUnification){
+ if (ConfigSwitches.enableThaumcraftShardUnification){
run();
}
}