From e62f7c9a905e3e4b8b905e863fa8cadce657f110 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Fri, 15 Dec 2017 11:33:43 +1000 Subject: $ Fixed Client side code called on server. --- src/Java/gtPlusPlus/core/lib/CORE.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core') 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;; -- cgit From 0b65e63e3705fc9ead2ddcb71e9da4ad808a2959 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Fri, 15 Dec 2017 12:14:47 +1000 Subject: Add TecTech support (#166) + Added check for TecTech mod. + Added TecTech support to my Base Multiblock. + Added TecTech support to my Power-Substation. + Added TecTech support to my Generator Array. % Made GT++ load after a few more mods that were recently added. $ Fixed else statement for computronics load message during startup. $ By now supporting Multi-amp Dynamos, this closes #161. --- src/Java/gtPlusPlus/core/lib/LoadedMods.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/core') 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"); -- cgit