From 425894733a628bbbf2f032ec6ec7cc0134058384 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Fri, 6 Dec 2013 16:53:05 +0000 Subject: [PATCH] Move EnvChecks into lib.environment, make hasOptifine flag, make unsupp logging configurable. --- src/mantle/Mantle.java | 2 +- src/mantle/lib/CoreConfig.java | 5 ++++- .../environment}/EnvironmentChecks.java | 13 +++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) rename src/mantle/{internal => lib/environment}/EnvironmentChecks.java (74%) diff --git a/src/mantle/Mantle.java b/src/mantle/Mantle.java index 77ae507..c82bd67 100644 --- a/src/mantle/Mantle.java +++ b/src/mantle/Mantle.java @@ -8,7 +8,7 @@ import cpw.mods.fml.common.Mod.EventHandler; import net.minecraftforge.common.Configuration; import static mantle.lib.CoreRepo.*; import mantle.lib.CoreConfig; -import mantle.internal.EnvironmentChecks; +import mantle.lib.environment.EnvironmentChecks; /** * Mantle diff --git a/src/mantle/lib/CoreConfig.java b/src/mantle/lib/CoreConfig.java index c0b7376..e42f97f 100644 --- a/src/mantle/lib/CoreConfig.java +++ b/src/mantle/lib/CoreConfig.java @@ -23,10 +23,13 @@ public class CoreConfig logger.info("Loading configuration from disk."); config.load(); - // TODO: Config vars get/set here + silenceEnvChecks = config.get("Environment", "unsupportedLogging", silenceEnvChecks).getBoolean(silenceEnvChecks); config.save(); logger.info("Configuration load completed."); } + // BEGIN CONFIG VARS + public static boolean silenceEnvChecks = false; + } diff --git a/src/mantle/internal/EnvironmentChecks.java b/src/mantle/lib/environment/EnvironmentChecks.java similarity index 74% rename from src/mantle/internal/EnvironmentChecks.java rename to src/mantle/lib/environment/EnvironmentChecks.java index c993bf7..b74ef53 100644 --- a/src/mantle/internal/EnvironmentChecks.java +++ b/src/mantle/lib/environment/EnvironmentChecks.java @@ -1,4 +1,4 @@ -package mantle.internal; +package mantle.lib.environment; import java.util.ArrayList; import java.util.List; @@ -10,6 +10,7 @@ import cpw.mods.fml.common.ICrashCallable; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; import mantle.crash.*; +import mantle.lib.CoreConfig; /** * Environment Checks @@ -25,6 +26,9 @@ public class EnvironmentChecks { } // Singleton + // Usable by other mods to detect Optifine. + public static boolean hasOptifine = false; + /** * Checks for conflicting stuff in environment; adds callable to any crash logs if so. * Note: This code adds additional data to crashlogs. It does not trigger any crashes. @@ -35,7 +39,8 @@ public class EnvironmentChecks if (FMLCommonHandler.instance().getSide() == Side.CLIENT && FMLClientHandler.instance().hasOptifine() || Loader.isModLoaded("optifine")) { - logger.severe("[Environment Checks] Optifine detected. This may cause issues due to base edits or ASM usage."); + if (!CoreConfig.silenceEnvChecks) logger.severe("[Environment Checks] Optifine detected. This may cause issues due to base edits or ASM usage."); + hasOptifine = true; modIds.add("optifine"); } @@ -44,7 +49,7 @@ public class EnvironmentChecks Class cl = Class.forName("org.bukkit.Bukkit"); if (cl != null) { - logger.severe("[Environment Checks] Bukkit implementation detected. This may cause issues. Bukkit implementations include Craftbukkit and MCPC+."); + if (!CoreConfig.silenceEnvChecks) logger.severe("[Environment Checks] Bukkit implementation detected. This may cause issues. Bukkit implementations include Craftbukkit and MCPC+."); modIds.add("bukkit"); } } @@ -58,7 +63,7 @@ public class EnvironmentChecks Class cl = Class.forName("magic.launcher.Launcher"); if (cl != null) { - logger.severe("[Environment Checks] Magic Launcher detected. This launches the game in strange ways and as such is not recommended."); + if (!CoreConfig.silenceEnvChecks) logger.severe("[Environment Checks] Magic Launcher detected. This launches the game in strange ways and as such is not recommended."); modIds.add("magic_launcher"); } }