diff --git a/build.gradle b/build.gradle index b0269b9..1ec2b6f 100644 --- a/build.gradle +++ b/build.gradle @@ -18,10 +18,15 @@ if (OperatingSystem.current().isWindows()) { } else if (OperatingSystem.current().isLinux()) { platform = 'linux' } +def slf4jVersion = '1.7.21' +def log4jVersion = '2.5' dependencies { compile (['org.lwjgl.lwjgl:lwjgl:' + lwjgl_ver], ['org.lwjgl.lwjgl:lwjgl_util:' + lwjgl_ver]) + compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion + compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4jVersion + compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4jVersion } sourceSets { diff --git a/resources/log4j2.xml b/resources/log4j2.xml new file mode 100644 index 0000000..2235f2c --- /dev/null +++ b/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/lwjake2/sys/Sys.java b/src/lwjake2/sys/Sys.java index 62ccc1a..42acc99 100644 --- a/src/lwjake2/sys/Sys.java +++ b/src/lwjake2/sys/Sys.java @@ -22,6 +22,8 @@ import lwjake2.Defines; import lwjake2.Globals; import lwjake2.client.CL; import lwjake2.qcommon.Com; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.FilenameFilter; @@ -32,6 +34,7 @@ import java.util.regex.PatternSyntaxException; * Sys */ public final class Sys extends Defines { + private static final Logger logger = LoggerFactory.getLogger(Sys.class); public static void Error(String error) { @@ -230,7 +233,14 @@ public final class Sys extends Defines { if (Globals.nostdout != null && Globals.nostdout.value != 0) return; - System.out.print(msg); + while (msg.startsWith("\n")) { + msg = msg.substring(1); + } + while (msg.endsWith("\n")) { + msg = msg.substring(0, msg.lastIndexOf("\n")); + } + + logger.info(msg); } } \ No newline at end of file