From c6bdbae46c18c7f9f8e84b28c5853bd11f929d30 Mon Sep 17 00:00:00 2001 From: lieght Date: Sat, 13 Sep 2025 13:51:13 +0200 Subject: [PATCH] Moved window to second thread. --- src/main/java/org/toop/Main.java | 23 +++++++++++++---------- src/main/java/org/toop/Window.java | 15 ++++++++++++--- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/toop/Main.java b/src/main/java/org/toop/Main.java index eed39fc..a6739b7 100644 --- a/src/main/java/org/toop/Main.java +++ b/src/main/java/org/toop/Main.java @@ -16,8 +16,8 @@ public class Main { throw new RuntimeException("A event could not be initialized"); } - Server.start("local", "127.0.0.1", "5001"); - Window.start(); + Server.start("remote", "127.0.0.1", "5001"); + Window.start(""); } @@ -26,22 +26,25 @@ 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.OnChangingServerBackend.class, + event -> + logger.info("Changing server backend state to {}", event.backend()) ); - GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerIp.class, e -> - logger.info("Changing server ip to {}", e.ip()) + GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerIp.class, + event -> + logger.info("Changing server ip to {}", event.ip()) ); - GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerPort.class, e -> - logger.info("Changing server port to {}", e.port()) + GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerPort.class, + event -> + logger.info("Changing server port to {}", event.port()) ); return true; } - catch (Exception e) { - logger.info("{}", e.getMessage()); + catch (Exception err) { + logger.info("{}", err.getMessage()); return false; } } diff --git a/src/main/java/org/toop/Window.java b/src/main/java/org/toop/Window.java index f56e818..ed8cf09 100644 --- a/src/main/java/org/toop/Window.java +++ b/src/main/java/org/toop/Window.java @@ -1,5 +1,7 @@ package org.toop; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.lwjgl.*; import org.lwjgl.glfw.*; import org.lwjgl.opengl.*; @@ -14,8 +16,9 @@ import static org.lwjgl.system.MemoryStack.*; import static org.lwjgl.system.MemoryUtil.*; import static org.lwjgl.stb.STBImage.*; -public class Window { +public class Window extends Thread { + private static final Logger logger = LogManager.getLogger(Main.class); // The window handle private long window; @@ -148,8 +151,14 @@ public class Window { //public static void main(String[] args) { //new Window().run(); //} - public static void start(){ - new Window().run(); + /** + * TODO: Is putting the window on a second thread, safe? + * Can't overwrite start(), so a overload is needed. + * + * @param ignoredKeepEmpty Just input "" an empty string. + */ + public static void start(String ignoredKeepEmpty){ + new Window().start(); } }