From 7c970d9a4d14d7b48c7298f61ef106022ecdd7e6 Mon Sep 17 00:00:00 2001
From: lieght <49651652+BAFGdeJong@users.noreply.github.com>
Date: Tue, 30 Sep 2025 23:32:37 +0200
Subject: [PATCH] Updated assetmanager to now load assets with an assetloader

---
 app/src/main/java/org/toop/Main.java                   |  3 +--
 .../java/org/toop/framework/asset/AssetLoader.java     |  5 +++++
 .../java/org/toop/framework/asset/AssetManager.java    | 10 ++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/toop/Main.java b/app/src/main/java/org/toop/Main.java
index 51cdcd4..508d1d8 100644
--- a/app/src/main/java/org/toop/Main.java
+++ b/app/src/main/java/org/toop/Main.java
@@ -10,14 +10,13 @@ import org.toop.framework.networking.NetworkingClientManager;
 import org.toop.framework.networking.NetworkingInitializationException;
 
 import javax.sound.sampled.*;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.NotDirectoryException;
 
 public class Main {
     static void main(String[] args) throws IOException, UnsupportedAudioFileException, LineUnavailableException, InterruptedException {
 
-        AssetManager.initializeLoader(new File("app/src/main/resources/assets"));
+        AssetManager.loadAssets(new AssetLoader("app/src/main/resources/assets"));
         var b = new NetworkingClientManager();
         var c = new SoundManager();
 
diff --git a/framework/src/main/java/org/toop/framework/asset/AssetLoader.java b/framework/src/main/java/org/toop/framework/asset/AssetLoader.java
index cb46506..620c77e 100644
--- a/framework/src/main/java/org/toop/framework/asset/AssetLoader.java
+++ b/framework/src/main/java/org/toop/framework/asset/AssetLoader.java
@@ -18,6 +18,11 @@ public class AssetLoader {
         fileSearcher(rootFolder);
     }
 
+    public AssetLoader(String rootFolder) {
+        this.rootFolder = new File(rootFolder);
+        fileSearcher(this.rootFolder);
+    }
+
     public File getRootFolder() {
         return this.rootFolder;
     }
diff --git a/framework/src/main/java/org/toop/framework/asset/AssetManager.java b/framework/src/main/java/org/toop/framework/asset/AssetManager.java
index 1b431eb..d5562ff 100644
--- a/framework/src/main/java/org/toop/framework/asset/AssetManager.java
+++ b/framework/src/main/java/org/toop/framework/asset/AssetManager.java
@@ -2,11 +2,13 @@ package org.toop.framework.asset;
 
 import org.toop.framework.asset.resources.*;
 
+import javax.sound.sampled.LineUnavailableException;
+import javax.sound.sampled.UnsupportedAudioFileException;
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
 
 public class AssetManager {
-    private static AssetLoader loader = null;
     private static final AssetManager INSTANCE = new AssetManager();
     private static final Map<String, Asset<? extends BaseResource>> assets = new HashMap<>();
 
@@ -16,9 +18,9 @@ public class AssetManager {
         return INSTANCE;
     }
 
-    public static void initializeLoader(File rootFolder) {
-        if (loader == null) {
-            loader = new AssetLoader(rootFolder);
+    public static void loadAssets(AssetLoader loader) {
+        for (var asset : loader.getAssets()) {
+            assets.put(asset.getName(), asset);
         }
     }