Add loop beatmap on collection

Renako.Game/Audio/RenakoAudioManager.cs

@@ -28,6 +28,9 @@ public partial class RenakoAudioManager : CompositeDrawable
     [Resolved]
     private GameHost host { get; set; }
 
+    [Resolved]
+    private BeatmapManager beatmapManager { get; set; }
+
     [BackgroundDependencyLoader]
     private void load(AudioManager audioManagerSource)
     {
@@ -88,6 +91,11 @@ private void changeTrackOnBeatmapSetChanged(BeatmapSet oldBeatmapSet, BeatmapSet
         }
 
         Track.Start();
+
+        Track.Completed += () =>
+        {
+            beatmapManager.NextBeatmapSet();
+        };
     }
 
     /// <summary>

Renako.Game/Beatmaps/BeatmapManager.cs

@@ -0,0 +1,44 @@
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
+
+namespace Renako.Game.Beatmaps;
+
+/// <summary>
+/// Class that contain all function related to beatmap and collection of beatmaps.
+/// </summary>
+public partial class BeatmapManager : CompositeDrawable
+{
+    [Resolved]
+    private BeatmapsCollection beatmapsCollection { get; set; }
+
+    [Resolved]
+    private WorkingBeatmap workingBeatmap { get; set; }
+
+    // [BackgroundDependencyLoader]
+    // private void load(BeatmapsCollection beatmapsCollection, WorkingBeatmap workingBeatmap)
+    // {
+    //     this.beatmapsCollection = beatmapsCollection;
+    //     this.workingBeatmap = workingBeatmap;
+    // }
+
+    /// <summary>
+    /// Set the working beatmap to the next beatmap in the collection.
+    /// </summary>
+    /// <param name="random">Whether to set the next beatmap randomly.</param>
+    public void NextBeatmapSet(bool random = false)
+    {
+        if (random)
+        {
+            workingBeatmap.BeatmapSet = beatmapsCollection.BeatmapSets[RNG.Next(beatmapsCollection.BeatmapSets.Count)];
+        }
+        else
+        {
+            int currentBeatmapSetIndex = beatmapsCollection.BeatmapSets.IndexOf(workingBeatmap.BeatmapSet);
+
+            workingBeatmap.BeatmapSet = currentBeatmapSetIndex == beatmapsCollection.BeatmapSets.Count - 1 ? beatmapsCollection.BeatmapSets[0] : beatmapsCollection.BeatmapSets[currentBeatmapSetIndex + 1];
+
+            workingBeatmap.Beatmap = beatmapsCollection.GetFirstBeatmapFromBeatmapSet(workingBeatmap.BeatmapSet);
+        }
+    }
+}

Renako.Game/Beatmaps/BeatmapsCollection.cs

@@ -107,6 +107,16 @@ public Beatmap[] GetBeatmapsFromBeatmapSet(BeatmapSet beatmapSet, bool sortByDif
         return beatmaps;
     }
 
+    /// <summary>
+    /// Get the first <see cref="Beatmap"/> from the <see cref="BeatmapSet"/> for set as default.
+    /// </summary>
+    /// <param name="beatmapSet">The <see cref="BeatmapSet"/> to get the <see cref="Beatmap"/> from</param>
+    /// <returns>The first <see cref="Beatmap"/> from the <see cref="BeatmapSet"/></returns>
+    public Beatmap GetFirstBeatmapFromBeatmapSet(BeatmapSet beatmapSet)
+    {
+        return GetBeatmapsFromBeatmapSet(beatmapSet, false).FirstOrDefault();
+    }
+
     /// <summary>
     /// Get the min and max difficulty rating from <see cref="Beatmap"/> in the <see cref="BeatmapSet"/>
     /// </summary>

Renako.Game/RenakoGame.cs

@@ -71,9 +71,7 @@ protected override void LoadComplete()
             else
             {
                 WorkingBeatmap.BeatmapSet = BeatmapsCollection.GetRandomBeatmapSet();
-                Beatmap[] beatmapsList = BeatmapsCollection.GetBeatmapsFromBeatmapSet(WorkingBeatmap.BeatmapSet);
-                if (beatmapsList.Length > 0)
-                    WorkingBeatmap.Beatmap = beatmapsList[0];
+                WorkingBeatmap.Beatmap = BeatmapsCollection.GetFirstBeatmapFromBeatmapSet(WorkingBeatmap.BeatmapSet);
             }
 
             RenakoAudioManager.Track?.Stop();

Renako.Game/RenakoGameBase.cs

@@ -51,6 +51,8 @@ public partial class RenakoGameBase : osu.Framework.Game
 
         protected WorkingBeatmap WorkingBeatmap;
 
+        protected BeatmapManager BeatmapManager;
+
         protected RenakoGameBase()
         {
             // Ensure game and tests scale with window size and screen DPI.
@@ -105,6 +107,8 @@ private void load()
             dependencies.CacheAs(LocalConfig);
             dependencies.CacheAs(BeatmapsCollection = new BeatmapsCollection());
             dependencies.CacheAs(WorkingBeatmap = new WorkingBeatmap());
+            dependencies.CacheAs(BeatmapManager = new BeatmapManager());
+            Add(BeatmapManager);
             dependencies.CacheAs(this);
         }