From cb7e3298fd376c3fb767833503e6d227d985295b Mon Sep 17 00:00:00 2001
From: lieght <49651652+BAFGdeJong@users.noreply.github.com>
Date: Tue, 14 Oct 2025 19:57:07 +0200
Subject: [PATCH] Added shuffling on user request

---
 app/src/main/java/org/toop/Main.java                       | 2 +-
 .../main/java/org/toop/framework/audio/MusicManager.java   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/toop/Main.java b/app/src/main/java/org/toop/Main.java
index 69b1b86..49ff87b 100644
--- a/app/src/main/java/org/toop/Main.java
+++ b/app/src/main/java/org/toop/Main.java
@@ -23,7 +23,7 @@ public final class Main {
         ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/assets"));
         new Thread(NetworkingClientManager::new).start();
         new Thread(() -> {
-            MusicManager<MusicAsset> musicManager = new MusicManager<>(ResourceManager.getAllOfTypeAndRemoveWrapper(MusicAsset.class));
+            MusicManager<MusicAsset> musicManager = new MusicManager<>(ResourceManager.getAllOfTypeAndRemoveWrapper(MusicAsset.class), true);
             SoundEffectManager<SoundEffectAsset> soundEffectManager = new SoundEffectManager<>(ResourceManager.getAllOfType(SoundEffectAsset.class));
             AudioVolumeManager audioVolumeManager = new AudioVolumeManager()
                     .registerManager(VolumeControl.MASTERVOLUME, musicManager)
diff --git a/framework/src/main/java/org/toop/framework/audio/MusicManager.java b/framework/src/main/java/org/toop/framework/audio/MusicManager.java
index ea20e8e..38a6f3a 100644
--- a/framework/src/main/java/org/toop/framework/audio/MusicManager.java
+++ b/framework/src/main/java/org/toop/framework/audio/MusicManager.java
@@ -18,10 +18,13 @@ public class MusicManager<T extends AudioResource> implements org.toop.framework
     private int playingIndex = 0;
     private boolean playing = false;
 
-    public MusicManager(List<T> resources) {
+    public MusicManager(List<T> resources, boolean shuffleMusic) {
         this.dispatcher = new JavaFXDispatcher();
         this.resources = resources;
-        createShuffled();
+        // Shuffle if wanting to shuffle
+        if (shuffleMusic) createShuffled();
+        else backgroundMusic.addAll(resources);
+        // ------------------------------
     }
 
     /**