From b050e06ceb0fc76b1f008c695888b70c5d9f0962 Mon Sep 17 00:00:00 2001
From: lieght <49651652+BAFGdeJong@users.noreply.github.com>
Date: Sun, 12 Oct 2025 01:56:06 +0200
Subject: [PATCH] Minor changes in API design

---
 app/src/main/java/org/toop/Main.java          | 23 +++++++++----------
 .../framework/audio/AudioEventListener.java   |  9 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/toop/Main.java b/app/src/main/java/org/toop/Main.java
index b2887a2..636565c 100644
--- a/app/src/main/java/org/toop/Main.java
+++ b/app/src/main/java/org/toop/Main.java
@@ -19,18 +19,17 @@ public final class Main {
         ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/assets"));
         new Thread(NetworkingClientManager::new).start();
         new Thread(() -> {
-            var mm = new MusicManager<>(MusicAsset.class);
-            var sem = new SoundEffectManager();
-            AudioEventListener<?, ?> a =
-                    new AudioEventListener<>(
-                        mm,
-                        sem,
-                        new AudioVolumeManager()
-                                .registerManager(VolumeTypes.MASTERVOLUME, mm)
-                                .registerManager(VolumeTypes.MASTERVOLUME, sem)
-                                .registerManager(VolumeTypes.FX, sem)
-                                .registerManager(VolumeTypes.MUSIC, mm)
-                    ); a.initListeners();
+            MusicManager<MusicAsset> musicManager = new MusicManager<>(MusicAsset.class);
+            SoundEffectManager soundEffectManager = new SoundEffectManager();
+                new AudioEventListener<>(
+                    musicManager,
+                    soundEffectManager,
+                    new AudioVolumeManager()
+                            .registerManager(VolumeTypes.MASTERVOLUME, musicManager)
+                            .registerManager(VolumeTypes.MASTERVOLUME, soundEffectManager)
+                            .registerManager(VolumeTypes.FX, soundEffectManager)
+                            .registerManager(VolumeTypes.MUSIC, musicManager)
+                ).initListeners();
         }).start();
     }
 }
diff --git a/framework/src/main/java/org/toop/framework/audio/AudioEventListener.java b/framework/src/main/java/org/toop/framework/audio/AudioEventListener.java
index 25aa599..86cda08 100644
--- a/framework/src/main/java/org/toop/framework/audio/AudioEventListener.java
+++ b/framework/src/main/java/org/toop/framework/audio/AudioEventListener.java
@@ -22,7 +22,7 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
         this.audioVolumeManager = audioVolumeManager;
     }
 
-    public void initListeners() {
+    public AudioEventListener<?, ?> initListeners() {
         new EventFlow()
                 .listen(this::handleStopMusicManager)
                 .listen(this::handlePlaySound)
@@ -34,9 +34,10 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
                 .listen(this::handleGetVolume)
                 .listen(this::handleGetFxVolume)
                 .listen(this::handleGetMusicVolume)
-                .listen(AudioEvents.ClickButton.class, _ -> {
-                    soundEffectManager.play("medium-button-click.wav", false);
-                });
+                .listen(AudioEvents.ClickButton.class, _ ->
+                        soundEffectManager.play("medium-button-click.wav", false));
+
+        return this;
     }
 
     private void handleStopMusicManager(AudioEvents.StopAudioManager event) {