From 80d3e47ad918abcb94d6559e43720b242b6950a4 Mon Sep 17 00:00:00 2001
From: lieght <49651652+BAFGdeJong@users.noreply.github.com>
Date: Sun, 7 Dec 2025 18:59:19 +0100
Subject: [PATCH] initSystems now uses latch instead of timer. Moved single
 threads to Executor

---
 app/src/main/java/org/toop/app/App.java | 29 +++++++++++++++++--------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/toop/app/App.java b/app/src/main/java/org/toop/app/App.java
index 3093c1c..19d0324 100644
--- a/app/src/main/java/org/toop/app/App.java
+++ b/app/src/main/java/org/toop/app/App.java
@@ -33,6 +33,9 @@ import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 
 import java.util.Objects;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public final class App extends Application {
 	private static Stage stage;
@@ -46,7 +49,7 @@ public final class App extends Application {
 	}
 
 	@Override
-	public void start(Stage stage) throws Exception {
+	public void start(Stage stage) {
 		// Start loading localization
 		ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/localization"));
 		ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/style"));
@@ -180,12 +183,20 @@ public final class App extends Application {
 	}
 
 	private void initSystems() { // TODO Move to better place
-		new Thread(() -> new NetworkingClientEventListener(
-				GlobalEventBus.get(),
-				new NetworkingClientManager(GlobalEventBus.get()))
-		).start();
 
-		new Thread(() -> {
+		final int THREAD_COUNT = 2;
+		CountDownLatch latch = new CountDownLatch(THREAD_COUNT);
+		ExecutorService threads = Executors.newFixedThreadPool(THREAD_COUNT);
+
+		threads.submit(() -> {
+			new NetworkingClientEventListener(
+					GlobalEventBus.get(),
+					new NetworkingClientManager(GlobalEventBus.get()));
+
+			latch.countDown();
+		});
+
+		threads.submit(() -> {
 			MusicManager<MusicAsset> musicManager =
 					new MusicManager<>(
 							GlobalEventBus.get(),
@@ -209,11 +220,11 @@ public final class App extends Application {
 					audioVolumeManager
 			).initListeners("medium-button-click.wav");
 
-		}).start();
+			latch.countDown();
+		});
 
-		// Threads must be ready, before continue, TODO use latch instead
         try {
-            Thread.sleep(200);
+            latch.await();
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }