From 7f8981cef83e86cb6952d9b1835fc5c215dddd46 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 12 May 2017 11:04:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B8=D0=BD=D0=B0=D0=B5?=
 =?UTF-8?q?=D0=BC=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20SLF4j+Log4j2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle             |  5 +++++
 resources/log4j2.xml     | 13 +++++++++++++
 src/lwjake2/sys/Sys.java | 12 +++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 resources/log4j2.xml

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%-5level] (%t) \{%logger{36}\} %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="all">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ 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