From 527378ac00cb11dede6a317927252c3344eae517 Mon Sep 17 00:00:00 2001
From: lieght <49651652+BAFGdeJong@users.noreply.github.com>
Date: Wed, 1 Oct 2025 15:08:18 +0200
Subject: [PATCH] Alpha rebase complete, added asset loader for UI branch

---
 app/src/main/java/org/toop/Main.java                       | 7 ++++++-
 app/src/main/java/org/toop/app/gui/RemoteGameSelector.java | 0
 app/src/main/java/org/toop/app/menu/MainMenu.java          | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 delete mode 100644 app/src/main/java/org/toop/app/gui/RemoteGameSelector.java

diff --git a/app/src/main/java/org/toop/Main.java b/app/src/main/java/org/toop/Main.java
index 72c2835..0f92ca8 100644
--- a/app/src/main/java/org/toop/Main.java
+++ b/app/src/main/java/org/toop/Main.java
@@ -1,6 +1,9 @@
 package org.toop;
 
 import org.toop.app.App;
+import org.toop.framework.asset.AssetLoader;
+import org.toop.framework.asset.AssetManager;
+import org.toop.framework.audio.SoundManager;
 import org.toop.framework.networking.NetworkingClientManager;
 import org.toop.framework.networking.NetworkingInitializationException;
 
@@ -11,6 +14,8 @@ public class Main {
 	}
 
 	private static void initSystems() throws NetworkingInitializationException {
-		new NetworkingClientManager();
+		AssetManager.loadAssets(new AssetLoader("app/src/main/resources/assets"));
+		new Thread(NetworkingClientManager::new).start();
+		new Thread(SoundManager::new).start();
 	}
 }
diff --git a/app/src/main/java/org/toop/app/gui/RemoteGameSelector.java b/app/src/main/java/org/toop/app/gui/RemoteGameSelector.java
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/main/java/org/toop/app/menu/MainMenu.java b/app/src/main/java/org/toop/app/menu/MainMenu.java
index d4e1b70..19d8040 100644
--- a/app/src/main/java/org/toop/app/menu/MainMenu.java
+++ b/app/src/main/java/org/toop/app/menu/MainMenu.java
@@ -25,7 +25,7 @@ public final class MainMenu extends Menu {
 		final VBox creditsBox = new VBox(10, credits, options, quit);
 		creditsBox.setAlignment(Pos.BOTTOM_CENTER);
 
-		pane = new StackPane(background, grid);
+		//pane = new StackPane(background, grid);
 		pane.getStylesheets().add(getClass().getResource("/style/main.css").toExternalForm());
 	}
 }
\ No newline at end of file