diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-15 12:26:48 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-15 12:26:48 +1000 |
| commit | 51bf52ffba6d4f4b31f0c2caf8a809bd5695c8dc (patch) | |
| tree | 11f0c47804adc1e27c6e553487f3b22d007aaa5d /src/Java/gtPlusPlus/core | |
| parent | 9d7b0cbc44d88cc757b3539077c9925daf1e38d1 (diff) | |
| parent | 0b65e63e3705fc9ead2ddcb71e9da4ad808a2959 (diff) | |
| download | GT5-Unofficial-51bf52ffba6d4f4b31f0c2caf8a809bd5695c8dc.tar.gz GT5-Unofficial-51bf52ffba6d4f4b31f0c2caf8a809bd5695c8dc.tar.bz2 GT5-Unofficial-51bf52ffba6d4f4b31f0c2caf8a809bd5695c8dc.zip | |
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 5 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/LoadedMods.java | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index c7bf277974..78b7cf4326 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -10,6 +10,8 @@ import java.util.concurrent.ConcurrentHashMap; import com.mojang.authlib.GameProfile; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.array.Pair; @@ -44,7 +46,8 @@ public class CORE { public static boolean DEVENV = false; public static boolean DEBUG = false; - public static boolean mFancyGraphics; + @SideOnly(Side.CLIENT) + public static boolean mFancyGraphics = false; //Only can be set in Dev, no config or setting elsewhere. public static final boolean LOAD_ALL_CONTENT = false;; diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java index d93e5acdfc..c807d8f03c 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java @@ -47,7 +47,8 @@ public class LoadedMods { public static boolean PamsHarvestcraft = false; public static boolean GalacticraftCore = false; public static boolean Mekanism = false; - public static boolean RedTech = false; + public static boolean RedTech = false; //RedMage's Mod + public static boolean TecTech = false; //Technus' Mod @@ -248,14 +249,19 @@ public class LoadedMods { Utils.LOG_INFO("Components disabled for: Computronics - This feature will enable itself if you remove Computronics."); totalMods++; } + else { + Utils.LOG_INFO("Components enabled for: Computronics - This feature will disable itself if you add Computronics."); + } if (Loader.isModLoaded("GTRedtech") == true){ RedTech = true; Utils.LOG_INFO("Components enabled for: GTRedtech"); totalMods++; } - else { - Utils.LOG_INFO("Components enabled for: Computronics - This feature will disable itself if you add Computronics."); - } + if (Loader.isModLoaded("tectech") == true){ + TecTech = true; + Utils.LOG_INFO("Components enabled for: TecTech"); + totalMods++; + } Utils.LOG_INFO("Content found for "+totalMods+" mods"); |