bug fixes

Author: Kade-github

BombRushRadio/BombRushRadio.cs

@@ -15,10 +15,11 @@
 
 namespace BombRushRadio
 {
-    [BepInPlugin("kade.bombrushradio", "Bomb Rush Radio!", "1.1.0.0")]
+    [BepInPlugin("kade.bombrushradio", "Bomb Rush Radio!", "1.1.1.0")]
     [BepInProcess("Bomb Rush Cyberfunk.exe")]
     public class BombRushRadio : BaseUnityPlugin
     {
+        public static MusicPlayer mInstance;
         public static BombRushRadio Instance = null;
         public static List<MusicTrack> audios = new();
         public int shouldBeDone = 0;
@@ -53,7 +54,7 @@ public IEnumerator LoadAudioFile(string filePath, AudioType type)
                     t.AudioClip = myClip;
                     t.Artist = songArtist;
                     t.Title = songName;
-                    t.isRepeatable = true;
+                    t.isRepeatable = false;
                     audios.Add(t);
 
                     Logger.LogInfo("[BRR] Loaded " + songName + " by " + songArtist + " (" + done + "/" + shouldBeDone + ")");
@@ -78,15 +79,62 @@ public IEnumerator LoadAudioFile(string filePath, AudioType type)
 
         public MusicBundle bundle;
         internal static ConfigEntry<KeyCode> reloadKey;
+
+        public IEnumerator LoadFile(string f)
+        {
+            AudioType type = AudioType.UNKNOWN;
+            switch (f.Split('.').Last().ToLower())
+            {
+                case "mp3":
+                    type = AudioType.MPEG;
+                    break;
+                case "wav":
+                    type = AudioType.WAV;
+                    break;
+                case "ogg":
+                    type = AudioType.OGGVORBIS;
+                    break;
+                default:
+                    yield return null;
+                    break;
+            }
+            shouldBeDone++;
+            StartCoroutine(LoadAudioFile(f, type));
+            yield return null;
+        }
+
+        public IEnumerator SearchDirectories(string path = "")
+        {
+            string p = path.Length == 0 ? Application.streamingAssetsPath + "/Mods/BombRushRadio/Songs" : path;
+            
+            foreach (string f in Directory.GetDirectories(p))
+            {
+                Logger.LogInfo("[BRR] Searching directory " + f);
+                StartCoroutine(SearchDirectories(f));
+            }
+            
+            foreach(string f in Directory.GetFiles(p))
+            {
+                StartCoroutine(LoadFile(f));
+            }
+            
+
+            yield return null;
+        }
+        
         public void ReloadSongs()
         {
             loading = true;
             if (audios.Count > 0)
             {
-                if (Core.Instance.audioManager.musicPlayer.IsPlaying)
+                if (Core.Instance.audioManager.musicPlayer.IsPlaying && mInstance != null)
                 {
                     Core.Instance.audioManager.musicPlayer.ForcePaused();
-                    Core.Instance.audioManager.musicPlayer.Clear();
+                    foreach (MusicTrack tra in mInstance.musicTrackQueue.currentMusicTracks)
+                    {
+                        if (audios.Find(m => tra.Artist == m.Artist && m.Title == tra.Title))
+                            mInstance.musicTrackQueue.currentMusicTracks.Remove(tra);
+                    }
                     addOnComplete = true;
                 }
 
@@ -101,28 +149,8 @@ public void ReloadSongs()
             Logger.LogInfo("[BRR] Loading songs...");
             shouldBeDone = 0;
             done = 0;
-            foreach(string f in Directory.GetFiles(Application.streamingAssetsPath + "/Mods/BombRushRadio/Songs"))
-            {
-                AudioType type;
-                switch (f.Split('.').Last().ToLower())
-                {
-                    case "mp3":
-                        type = AudioType.MPEG;
-                        break;
-                    case "wav":
-                        type = AudioType.WAV;
-                        break;
-                    case "ogg":
-                        type = AudioType.OGGVORBIS;
-                        break;
-                    default:
-                        continue;
-                }
-                shouldBeDone++;
-                StartCoroutine(LoadAudioFile(f, type));
-            }
-            
 
+            StartCoroutine(SearchDirectories());
         }
 
 

BombRushRadio/MusicPlayer-Patches.cs

@@ -9,9 +9,13 @@ public class MusicPlayer_Patches
 {
     static void Prefix(MusicPlayer __instance)
     {
-        if (BombRushRadio.inMainMenu)
+        if (BombRushRadio.inMainMenu || BombRushRadio.loading)
             return; // don't do it in the mainmenu
 
+        BombRushRadio.mInstance = __instance;
+
+        Debug.Log("[BRR] Amount of tracks " + __instance.musicTrackQueue.AmountOfTracks);
+        
         foreach (MusicTrack track in BombRushRadio.audios)
         {
             if (__instance.musicTrackQueue.currentMusicTracks.Find(m =>
@@ -20,8 +24,6 @@ static void Prefix(MusicPlayer __instance)
 
             __instance.musicTrackQueue.currentMusicTracks.Add(track);
         }
-        
-        __instance.musicTrackQueue.BufferTracksInQueue();
 
         Debug.Log("[BRR] Line up: ");
         int i = 0;
@@ -42,4 +44,13 @@ public class MusicTrackQueue_Patches
             return false;
         return true;
     }
+}
+
+[HarmonyPatch(typeof(MusicPlayer), nameof(MusicPlayer.PlayFrom))]
+public class MusicPlayer_Patches_PlayFrom
+{
+    static void Prefix(MusicPlayer __instance, int index, int playbackSamples = 0)
+    {
+        __instance.ForcePaused();
+    }
 }