diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8..93b2e6f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip diff --git a/src/mantle/debug/LogIdentifier.java b/src/mantle/debug/LogIdentifier.java index ef8b0d3..8a73b01 100644 --- a/src/mantle/debug/LogIdentifier.java +++ b/src/mantle/debug/LogIdentifier.java @@ -2,6 +2,8 @@ package mantle.debug; import java.io.PrintStream; import static mantle.lib.CoreRepo.logger; + +import cpw.mods.fml.common.Loader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,15 +14,18 @@ public class LogIdentifier public void preinit () { - logger.info("Inserting TracingPrintStream..."); - System.setOut(new TracingPrintStream(outLogger, "STDOUT", System.out)); - System.setErr(new TracingPrintStream(errLogger, "STDERR", System.err)); - logger.info("TracingPrintStream inserted on STDOUT/STDERR. These will now be redirected to the Mantle-STDOUT/Mantle-STDERR loggers."); - System.out.println("Mantle redirect test-out"); - System.err.println("Mantle redirect test-err");//intended behavior to be able to ensure the integrity of the redirector - //logger.info("Forcing Java.util.Logger logging into log4j2"); - //JavaLoggingRedirector.activate(); - // logger.info("Successfully redirected java.util.logging"); + if(!Loader.isModLoaded("Artemis"))//this is completely useless if artemis is installed + { + logger.info("Inserting TracingPrintStream..."); + System.setOut(new TracingPrintStream(outLogger, "STDOUT", System.out)); + System.setErr(new TracingPrintStream(errLogger, "STDERR", System.err)); + logger.info("TracingPrintStream inserted on STDOUT/STDERR. These will now be redirected to the Mantle-STDOUT/Mantle-STDERR loggers."); + System.out.println("Mantle redirect test-out"); + System.err.println("Mantle redirect test-err");//intended behavior to be able to ensure the integrity of the redirector + //logger.info("Forcing Java.util.Logger logging into log4j2"); + //JavaLoggingRedirector.activate(); + // logger.info("Successfully redirected java.util.logging"); + } } }