From 11556ad3632f3ff9b7c38b71ab33f379feec4294 Mon Sep 17 00:00:00 2001
From: Bas de Jong <basdejong2002@live.nl>
Date: Thu, 11 Sep 2025 16:09:18 +0200
Subject: [PATCH] Multithreaded server implementation.

---
 src/main/java/org/toop/Main.java              | 27 +++++++++----------
 src/main/java/org/toop/server/Server.java     | 12 +++++++--
 src/main/java/org/toop/server/ServerTask.java | 22 ---------------
 3 files changed, 22 insertions(+), 39 deletions(-)
 delete mode 100644 src/main/java/org/toop/server/ServerTask.java

diff --git a/src/main/java/org/toop/Main.java b/src/main/java/org/toop/Main.java
index 7d16e1a..eed39fc 100644
--- a/src/main/java/org/toop/Main.java
+++ b/src/main/java/org/toop/Main.java
@@ -1,13 +1,11 @@
 package org.toop;
 
-import org.toop.eventbus.EventRegistry;
 import org.toop.eventbus.Events;
 import org.toop.eventbus.GlobalEventBus;
 import org.toop.server.Server;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.toop.server.ServerTask;
 
 public class Main {
     private static final Logger logger = LogManager.getLogger(Main.class);
@@ -18,8 +16,7 @@ public class Main {
             throw new RuntimeException("A event could not be initialized");
         }
 
-        Server server = new Server(Server.ServerBackend.LOCAL, "127.0.0.1", "5000");
-
+        Server.start("local", "127.0.0.1", "5001");
         Window.start();
 
     }
@@ -29,17 +26,17 @@ public class Main {
      */
      private static boolean initEvents() {
         try {
-//            GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerBackend.class, e ->
-//                    logger.info("Changing server backend state to {}", e.backend())
-//            );
-//
-//            GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerIp.class, e ->
-//                    logger.info("Changing server ip to {}", e.ip())
-//            );
-//
-//            GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerPort.class, e ->
-//                    logger.info("Changing server port to {}", e.port())
-//            );
+            GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerBackend.class, e ->
+                    logger.info("Changing server backend state to {}", e.backend())
+            );
+
+            GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerIp.class, e ->
+                    logger.info("Changing server ip to {}", e.ip())
+            );
+
+            GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerPort.class, e ->
+                    logger.info("Changing server port to {}", e.port())
+            );
 
             return true;
         }
diff --git a/src/main/java/org/toop/server/Server.java b/src/main/java/org/toop/server/Server.java
index 385c8c4..3f26bd6 100644
--- a/src/main/java/org/toop/server/Server.java
+++ b/src/main/java/org/toop/server/Server.java
@@ -168,10 +168,18 @@ public class Server extends Thread {
 
     public void run() {
         while (true) {
-//            logger.info(server.getIp());
-            logger.info(this.isAlive());
+            logger.info("Ik ben Bas, hallo");
+            try {
+                sleep(1000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
         }
     }
 
+    public static void start(String backend, String ip, String port) {
+        new Server(ServerBackend.valueOf(backend.toUpperCase()), ip, port).start();
+    }
+
 }
 
diff --git a/src/main/java/org/toop/server/ServerTask.java b/src/main/java/org/toop/server/ServerTask.java
deleted file mode 100644
index cd45bb6..0000000
--- a/src/main/java/org/toop/server/ServerTask.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.toop.server;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.toop.Main;
-
-public class ServerTask extends Thread {
-    private static final Logger logger = LogManager.getLogger(Main.class);
-    Server server;
-
-    public ServerTask(Server server) {
-        this.server = server;
-    }
-
-    public void run() {
-        while (true) {
-//            logger.info(server.getIp());
-            logger.info(this.isAlive());
-        }
-    }
-
-}