aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/api
diff options
context:
space:
mode:
authorAlexdoru <57050655+Alexdoru@users.noreply.github.com>2024-09-22 01:41:01 +0200
committerGitHub <noreply@github.com>2024-09-21 23:41:01 +0000
commitcc0266c5a740a2155536694111ba37ac8c3f1d46 (patch)
tree4d0e44a1e1c78a2345911090b265aee777409888 /src/main/java/gtPlusPlus/api
parent93966f7709e765b8be05b5127054046c9ac3bce0 (diff)
downloadGT5-Unofficial-cc0266c5a740a2155536694111ba37ac8c3f1d46.tar.gz
GT5-Unofficial-cc0266c5a740a2155536694111ba37ac8c3f1d46.tar.bz2
GT5-Unofficial-cc0266c5a740a2155536694111ba37ac8c3f1d46.zip
GT++ ASM Cleanup (#3238)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/api')
-rw-r--r--src/main/java/gtPlusPlus/api/objects/Logger.java21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java
index c97c787cd3..2214e50e78 100644
--- a/src/main/java/gtPlusPlus/api/objects/Logger.java
+++ b/src/main/java/gtPlusPlus/api/objects/Logger.java
@@ -4,9 +4,9 @@ import org.apache.logging.log4j.LogManager;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gregtech.asm.GTCorePlugin;
import gtPlusPlus.core.config.ASMConfiguration;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.preloader.PreloaderCore;
public class Logger {
@@ -37,8 +37,7 @@ public class Logger {
// Non-Dev Comments
public static void MACHINE_INFO(String s, Object... args) {
if (enabled) {
- boolean localPlayer = PreloaderCore.DEV_ENVIRONMENT;
- if (Configuration.debug.MachineInfo || localPlayer) {
+ if (Configuration.debug.MachineInfo || GTCorePlugin.isDevEnv()) {
final String name1 = gtPlusPlus.core.util.reflect.ReflectionUtils.getMethodName(2);
modLogger.info("Machine Info: " + s + " | " + name1, args);
}
@@ -48,7 +47,7 @@ public class Logger {
// Developer Comments
public static void WARNING(final String s) {
if (enabled) {
- if (PreloaderCore.DEBUG_MODE) {
+ if (ASMConfiguration.debug.debugMode) {
modLogger.warn(s);
}
}
@@ -57,7 +56,7 @@ public class Logger {
// Errors
public static void ERROR(final String s) {
if (enabled) {
- if (PreloaderCore.DEBUG_MODE) {
+ if (ASMConfiguration.debug.debugMode) {
modLogger.fatal(s);
}
}
@@ -95,7 +94,7 @@ public class Logger {
*/
public static void DEBUG_BEES(final String s) {
if (enabled) {
- if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) {
+ if (GTCorePlugin.isDevEnv() || ASMConfiguration.debug.debugMode) {
modLogger.info("[Debug][Bees] " + s);
}
}
@@ -106,7 +105,7 @@ public class Logger {
*/
public static void MATERIALS(final String s) {
if (enabled) {
- if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) {
+ if (GTCorePlugin.isDevEnv() || ASMConfiguration.debug.debugMode) {
modLogger.info("[Materials] " + s);
}
}
@@ -117,7 +116,7 @@ public class Logger {
*/
public static void DEBUG_MATERIALS(final String s) {
if (enabled) {
- if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) {
+ if (GTCorePlugin.isDevEnv() || ASMConfiguration.debug.debugMode) {
modLogger.info("[Debug][Materials] " + s);
}
}
@@ -128,7 +127,7 @@ public class Logger {
*/
public static void REFLECTION(final String s) {
if (enabled) {
- if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) {
+ if (GTCorePlugin.isDevEnv() || ASMConfiguration.debug.debugMode) {
modLogger.info("[Reflection] " + s);
}
}
@@ -139,7 +138,7 @@ public class Logger {
*/
public static void WORLD(final String s) {
if (enabled) {
- if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) {
+ if (GTCorePlugin.isDevEnv() || ASMConfiguration.debug.debugMode) {
modLogger.info("[WorldGen] " + s);
}
}
@@ -148,7 +147,7 @@ public class Logger {
public static void RECIPE(String string) {
if (enabled) {
if (
- /* CORE_Preloader.DEV_ENVIRONMENT || */ PreloaderCore.DEBUG_MODE) {
+ /* GTCorePlugin.isDevEnv() || */ ASMConfiguration.debug.debugMode) {
modLogger.info("[Recipe] " + string);
}
}