upd: my logger

11 files changed, 43 insertions, 52 deletions

diff --git a/core/build.gradle b/core/build.gradle
index a731b5d..18766c3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -4,7 +4,6 @@ eclipse.project.name = appName + '-core'
 dependencies {
   api "com.github.mgsx-dev.gdx-gltf:gltf:$gdxGltfVersion"
   api "com.github.MrStahlfelge.gdx-websockets:core:$gdxWsVersion"
-  api "ch.qos.logback:logback-classic:$logbackVersion"
   api project(':shared')
 
   if (enableGraalNative == 'true') {
diff --git a/core/src/main/java/kz/ilotterytea/frogartha/sessions/IdentityClient.java b/core/src/main/java/kz/ilotterytea/frogartha/sessions/IdentityClient.java
index aa8389b..1e09e8e 100644
--- a/core/src/main/java/kz/ilotterytea/frogartha/sessions/IdentityClient.java
+++ b/core/src/main/java/kz/ilotterytea/frogartha/sessions/IdentityClient.java
@@ -1,8 +1,7 @@
 package kz.ilotterytea.frogartha.sessions;
 
 import kz.ilotterytea.frogartha.FrogarthaGame;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import kz.ilotterytea.frogartha.utils.Logger;
 
 public class IdentityClient {
     private final Logger log;
@@ -12,7 +11,7 @@ public class IdentityClient {
     private boolean isProcessing, isAuthorized;
 
     public IdentityClient() {
-        this.log = LoggerFactory.getLogger(IdentityClient.class);
+        this.log = new Logger(IdentityClient.class);
         this.game = FrogarthaGame.getInstance();
 
         this.username = null;
diff --git a/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java b/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java
index 67afd69..0e097a7 100644
--- a/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java
+++ b/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java
@@ -9,9 +9,8 @@ import kz.ilotterytea.frogartha.FrogarthaGame;
 import kz.ilotterytea.frogartha.domain.Identity;
 import kz.ilotterytea.frogartha.domain.server.Acknowledge;
 import kz.ilotterytea.frogartha.exceptions.PlayerKickException;
+import kz.ilotterytea.frogartha.utils.Logger;
 import kz.ilotterytea.frogartha.utils.SerializerUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class SessionClient implements WebSocketListener {
     private final Logger log;
@@ -27,20 +26,20 @@ public class SessionClient implements WebSocketListener {
         SerializerUtils.registerTypes(serializer);
         connection.setSerializer(serializer);
 
-        this.log = LoggerFactory.getLogger(SessionClient.class);
+        this.log = new Logger(SessionClient.class);
         this.game = FrogarthaGame.getInstance();
     }
 
     @Override
     public boolean onOpen(WebSocket webSocket) {
-        log.info("Connected");
+        log.log("Connected");
         updateIdentity();
         return true;
     }
 
     @Override
     public boolean onClose(WebSocket webSocket, int closeCode, String reason) {
-        log.info("Connection closed! Reason: {} {}", closeCode, reason);
+        log.log("Connection closed! Reason: {} {}", closeCode, reason);
         game.getIdentityClient().setAuthorized(false);
         return true;
     }
@@ -62,7 +61,7 @@ public class SessionClient implements WebSocketListener {
             if (obj instanceof Acknowledge) SessionHandlers.handleAcknowledge((Acknowledge) obj);
             else if (obj instanceof PlayerKickException) throw (PlayerKickException) obj;
         } catch (PlayerKickException e) {
-            log.info("Kicked out: {}", e.getMessage());
+            log.log("Kicked out: {}", e.getMessage());
         } catch (Exception e) {
             log.error("An exception was thrown while processing message", e);
         }
diff --git a/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionHandlers.java b/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionHandlers.java
index cb6457d..383640b 100644
--- a/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionHandlers.java
+++ b/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionHandlers.java
@@ -2,16 +2,15 @@ package kz.ilotterytea.frogartha.sessions;
 
 import kz.ilotterytea.frogartha.FrogarthaGame;
 import kz.ilotterytea.frogartha.domain.server.Acknowledge;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import kz.ilotterytea.frogartha.utils.Logger;
 
 public class SessionHandlers {
-    private static final Logger log = LoggerFactory.getLogger(SessionHandlers.class);
+    private static final Logger log = new Logger(SessionHandlers.class);
     private static final FrogarthaGame game = FrogarthaGame.getInstance();
     private static final SessionClient client = game.getSessionClient();
 
     public static void handleAcknowledge(Acknowledge acknowledge) {
-        log.info("The server was acknowledged: {}", acknowledge);
+        log.log("The server was acknowledged: {}", acknowledge);
 
         if (acknowledge.getCode() == Acknowledge.AcknowledgeCode.IDENTIFIED) {
             game.getIdentityClient().setAuthorized(true);
diff --git a/gradle.properties b/gradle.properties
index 5e93e6d..80f67f8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,5 +10,4 @@ gdxVersion=1.13.1
 gdxWsVersion=1.9.10.3
 gdxWsLibVersion=1.9.1.9.6
 javaWebsocketVersion=1.6.0
-logbackVersion=1.5.15
 projectVersion=1.0.0
diff --git a/lwjgl3/src/main/resources/logback.xml b/lwjgl3/src/main/resources/logback.xml
deleted file mode 100644
index ad8b6c8..0000000
--- a/lwjgl3/src/main/resources/logback.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%cyan(%d{HH:mm:ss.SSS}) %gray([%thread]) %highlight(%-5level) %magenta(%logger{36}) - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="STDOUT"/>
-    </root>
-</configuration>
diff --git a/server/build.gradle b/server/build.gradle
index c5c7272..d4acfbd 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -13,7 +13,6 @@ eclipse.project.name = appName + '-server'
 
 dependencies {
   api "org.java-websocket:Java-WebSocket:$javaWebsocketVersion"
-  api "ch.qos.logback:logback-classic:$logbackVersion"
   implementation project(':shared')
 }
 
diff --git a/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java b/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java
index 1dbb4bd..e25dffd 100644
--- a/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java
+++ b/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java
@@ -3,13 +3,12 @@ package kz.ilotterytea.frogartha.server;
 import com.github.czyzby.websocket.serialization.impl.ManualSerializer;
 import kz.ilotterytea.frogartha.domain.Identity;
 import kz.ilotterytea.frogartha.exceptions.PlayerKickException;
+import kz.ilotterytea.frogartha.utils.Logger;
 import kz.ilotterytea.frogartha.utils.SerializerUtils;
 import org.java_websocket.WebSocket;
 import org.java_websocket.framing.CloseFrame;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.server.WebSocketServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
@@ -26,7 +25,7 @@ public class FrogarthaServer extends WebSocketServer {
 
     private FrogarthaServer() {
         super(new InetSocketAddress(20015));
-        this.log = LoggerFactory.getLogger(FrogarthaServer.class);
+        this.log = new Logger(FrogarthaServer.class);
         this.players = new ArrayList<>();
 
         this.serializer = new ManualSerializer();
@@ -36,7 +35,7 @@ public class FrogarthaServer extends WebSocketServer {
     @Override
     public void onOpen(WebSocket webSocket, ClientHandshake clientHandshake) {
         PlayerConnection player = new PlayerConnection(webSocket);
-        log.info("{} ({}) connected!", player, webSocket.getRemoteSocketAddress().getAddress().getHostAddress());
+        log.log("{} ({}) connected!", player, webSocket.getRemoteSocketAddress().getAddress().getHostAddress());
         this.players.add(player);
     }
 
@@ -45,10 +44,10 @@ public class FrogarthaServer extends WebSocketServer {
         Optional<PlayerConnection> player = this.players.stream().filter((x) -> x.getConnection().equals(webSocket)).findFirst();
 
         if (player.isPresent()) {
-            log.info("{} has left! Reason: {} {}", player.get(), i, s);
+            log.log("{} has left! Reason: {} {}", player.get(), i, s);
             this.players.remove(player.get());
         } else {
-            log.info("Unknown connection was closed! Reason: {} {}", i, s);
+            log.log("Unknown connection was closed! Reason: {} {}", i, s);
         }
     }
 
@@ -94,7 +93,7 @@ public class FrogarthaServer extends WebSocketServer {
 
     @Override
     public void onStart() {
-        log.info("Running the server on port {}", getPort());
+        log.log("Running the server on port {}", getPort());
         setConnectionLostTimeout(0);
         setConnectionLostTimeout(100);
     }
@@ -103,7 +102,7 @@ public class FrogarthaServer extends WebSocketServer {
         player.send(exception);
         player.getConnection().close();
         players.remove(player);
-        log.debug("Kicked out {}! Reason: {}", player, exception.getMessage());
+        log.log("Kicked out {}! Reason: {}", player, exception.getMessage());
     }
 
     public static FrogarthaServer getInstance() {
diff --git a/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java b/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java
index 7ad2f25..b50392f 100644
--- a/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java
+++ b/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java
@@ -3,11 +3,10 @@ package kz.ilotterytea.frogartha.server;
 import kz.ilotterytea.frogartha.domain.Identity;
 import kz.ilotterytea.frogartha.domain.server.Acknowledge;
 import kz.ilotterytea.frogartha.exceptions.PlayerKickException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import kz.ilotterytea.frogartha.utils.Logger;
 
 public class ServerHandlers {
-    private static final Logger log = LoggerFactory.getLogger(ServerHandlers.class);
+    private static final Logger log = new Logger(ServerHandlers.class);
     private static final FrogarthaServer server = FrogarthaServer.getInstance();
 
     public static void handleIdentity(PlayerConnection player, Identity identity) {
@@ -21,6 +20,6 @@ public class ServerHandlers {
 
         player.setIdentity(identity);
         player.send(new Acknowledge(Acknowledge.AcknowledgeCode.IDENTIFIED));
-        log.debug("Successfully identified {} for {}", identity, player);
+        log.log("Successfully identified {} for {}", identity, player);
     }
 }
diff --git a/server/src/main/resources/logback.xml b/server/src/main/resources/logback.xml
deleted file mode 100644
index ad8b6c8..0000000
--- a/server/src/main/resources/logback.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%cyan(%d{HH:mm:ss.SSS}) %gray([%thread]) %highlight(%-5level) %magenta(%logger{36}) - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="STDOUT"/>
-    </root>
-</configuration>
diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/utils/Logger.java b/shared/src/main/java/kz/ilotterytea/frogartha/utils/Logger.java
new file mode 100644
index 0000000..d92a8cb
--- /dev/null
+++ b/shared/src/main/java/kz/ilotterytea/frogartha/utils/Logger.java
@@ -0,0 +1,23 @@
+package kz.ilotterytea.frogartha.utils;
+
+public class Logger {
+    private final String name;
+
+    public Logger(Class<?> clazz) {
+        this.name = clazz.getSimpleName();
+    }
+
+    public void log(String message, Object... arguments) {
+        String msg = message;
+
+        for (Object argument : arguments) {
+            msg = msg.replaceFirst("\\{}", argument.toString());
+        }
+
+        System.out.println("[" + name + "] " + msg);
+    }
+
+    public void error(String message, Throwable throwable) {
+        System.out.println("[" + name + "] " + message + ": " + throwable.getMessage());
+    }
+}