From fdc0636554ca83daf3762c229feee047f34966b5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 23 Feb 2024 17:30:31 +0300
Subject: [PATCH] General code cleanup

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 12 +++++-----
 .../OnlinePlay/Match/RoomModSelectOverlay.cs  | 22 +++++++++----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index fa87b0aa0d..bf43dc3d9c 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -274,12 +274,12 @@ namespace osu.Game.Overlays.Mods
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight
                         },
-                        beatmapAttributesDisplay = CreateBeatmapAttributesDisplay().With(b =>
+                        beatmapAttributesDisplay = new BeatmapAttributesDisplay
                         {
-                            b.Anchor = Anchor.BottomRight;
-                            b.Origin = Anchor.BottomRight;
-                            b.BeatmapInfo.Value = Beatmap?.BeatmapInfo;
-                        }),
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight,
+                            BeatmapInfo = { Value = Beatmap?.BeatmapInfo },
+                        },
                     }
                 });
             }
@@ -289,8 +289,6 @@ namespace osu.Game.Overlays.Mods
             textSearchStartsActive = configManager.GetBindable<bool>(OsuSetting.ModSelectTextSearchStartsActive);
         }
 
-        protected virtual BeatmapAttributesDisplay CreateBeatmapAttributesDisplay() => new BeatmapAttributesDisplay();
-
         public override void Hide()
         {
             base.Hide();
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/RoomModSelectOverlay.cs
index dd0ecbad90..db7cfe980c 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomModSelectOverlay.cs
@@ -16,32 +16,32 @@ namespace osu.Game.Screens.OnlinePlay.Match
 {
     public partial class RoomModSelectOverlay : UserModSelectOverlay
     {
-        public RoomModSelectOverlay(OverlayColourScheme colourScheme = OverlayColourScheme.Plum)
-            : base(colourScheme)
-        {
-        }
-
-        [Resolved(CanBeNull = true)]
-        private IBindable<PlaylistItem>? selectedItem { get; set; }
+        [Resolved]
+        private IBindable<PlaylistItem> selectedItem { get; set; } = null!;
 
         [Resolved]
         private RulesetStore rulesets { get; set; } = null!;
 
         private readonly List<Mod> roomMods = new List<Mod>();
 
+        public RoomModSelectOverlay()
+            : base(OverlayColourScheme.Plum)
+        {
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            selectedItem?.BindValueChanged(_ =>
+            selectedItem.BindValueChanged(_ =>
             {
                 roomMods.Clear();
 
-                if (selectedItem?.Value != null)
+                if (selectedItem.Value is PlaylistItem item)
                 {
-                    var rulesetInstance = rulesets.GetRuleset(selectedItem.Value.RulesetID)?.CreateInstance();
+                    var rulesetInstance = rulesets.GetRuleset(item.RulesetID)?.CreateInstance();
                     Debug.Assert(rulesetInstance != null);
-                    roomMods.AddRange(selectedItem.Value.RequiredMods.Select(m => m.ToMod(rulesetInstance)));
+                    roomMods.AddRange(item.RequiredMods.Select(m => m.ToMod(rulesetInstance)));
                 }
 
                 SelectedMods.TriggerChange();